This reverts commit r281323. It caused chromium test failures and a selfhost failure. llvm-svn: 281451