Revert r322132; it appears to be an accidental commit, based on the commit...

Revert r322132; it appears to be an accidental commit, based on the commit message. The original author of the commit has not commented on whether this was accidental or purposeful, so if this revert is in error, the author can re-commit with an actual commit message.

llvm-svn: 323466