Revert r289979 due to regressions

llvm-svn: 289991
28 files changed