Revert r107235, it had a silly typo in it, and fixing the typo breaks something

else. Get the build bots happy while I debug. Very sorry for the delay fixing
this...

llvm-svn: 107239