Restore (and complete) bug fix, make previously added test pass.

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