This reverts commit 9b243916. This was an unrelated NFC change to make a test more useful (really it should have been first, it was supposed to show the test diff).
