Restore bug fix, make previously added test pass.

1 job for 309037-non-regression-test in 6 minutes and 2 seconds (queued for 1 second)