Revert r234613 (and follow-ups 234614, 234616, 234618), it caused PR23216.

llvm-svn: 234789
11 files changed