Revert r132910 and r132909 on behalf of Michael. They didn't build with clang.