Back out some changes that accidentally committed.

llvm-svn: 150254
10 files changed