Revert this patch; I was emailing with Eugene and they have some other changes going

in today and don't want the two changes to confuse the situation with the build bots.
I'll commit tomorrow once they're known good.

llvm-svn: 313934