This reverts part of r287009 because I accidentally changed binary files. llvm-svn: 287010
llvm-svn: 287009
llvm-svn: 154207