Revert an "optimization" that I added in revision 89887, as the user who reported