Speculatively revert r108813, in an attempt to get the self-host buildbots...

Speculatively revert r108813, in an attempt to get the self-host buildbots working again.  I don't see why this patch
would cause them to fail the way they are, but none of the other intervening patches seem likely either.

llvm-svn: 108818