The i686-mingw32-RA-on-linux bot is still having errors. This reverts commit r301236. llvm-svn: 301240