Revert r142530 at least temporarily while a discussion is had on llvm-commits regardi...