Restore bug fix, make previously added test pass.

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