Undo the previous change and fix the test.
The previous change didn't feel right, so this rolls it back and fixes the
problem at the level of the test, instead.