Revert r203488 and r203520.

llvm-svn: 203687
4 files changed