Revert r298652 on Quentin's request

llvm-svn: 298727
3 files changed