Reverting 268054 & 268063 as they caused PR27579.

llvm-svn: 268150
20 files changed