revert r159851.

llvm-svn: 159854
6 files changed