Restore bug fix, make previously added test pass.

1 job for 316630-non-regression-test in 5 minutes and 50 seconds