Revert accidental commit I had to make to get the test case in PR17268 to still work correctly.