This reverts commit r271365.
Sorry, wrong branch.

llvm-svn: 271366