Revert 189161

llvm-svn: 189176
2 files changed