This reverts commit abc7e2b6. The commit was incomplete. I'll revert and reland the full commit, so that the correct change is a single commit. llvm-svn: 371850
