Restore bug fix, make previously added test pass.

1 job for 316373-non-regression-test in 5 minutes and 56 seconds (queued for 2 seconds)