Revert r150222, as the clang driver now handles this properly.