Revert r299635 because it exposed a latent bug.

llvm-svn: 299655
13 files changed