This reverts commit r224043 and r224042.

check-llvm was failing.