Revert r100896 and around - this breaks the only mingw32 buildbot we have.