Restore bug fix, make previously added test pass.

1 job for 315399-non-regression-test in 5 minutes and 55 seconds (queued for 1 second)