Revert r178713

llvm-svn: 178769
6 files changed