This patch reverts a fix, I had reverted with my last commit

The last patch committed reverted the fix in
8de065bd6f157950d0b97594f16c539dce3e924b which made the test failures worse.

This patch reverts that revert.

Signed-off-by: Ken Barber <ken@bob.sh>