Revert merge of clang trunk r244063, which I did not intend to commit
yet. Reminder to self: never merge to an unclean tree.