Reverting 268055 as it caused PR27579.

llvm-svn: 268151
5 files changed