Revert 253497 and 253539 to try to fix clang-cmake-mips buildbot.