Restore bug fix, make previously added test pass.

1 job for 316416-non-regression-test in 6 minutes and 2 seconds