Restore bug fix, make previously added test pass.

4 jobs for 316204-non-regression-test in 10 minutes and 33 seconds (queued for 2 seconds)