Restore bug fix, make previously added test pass.

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