Reverted revision 226577.

llvm-svn: 226595
17 files changed