Revert r114919, which caused some serious regressions on ARM.