Revert r283887 and r283882, until the issue is understood and fixed.

llvm-svn: 283890
15 files changed