Revert r138894. This was failing on cmake-clang-i686-msvc10.