Revert r119593 while I figure out my testing disagrees with the buildbot.