Revert r100191 since it breaks objc in clang