Revert r148056 while I investigate failures.

llvm-svn: 148068
2 files changed