Revert r154749 for now at John McCall's request.

llvm-svn: 154846
2 files changed