Restore bug fix, make previously added test pass.

1 job for 306503-non-regression-test in 5 minutes and 47 seconds (queued for 3 seconds)