search for: e65f83d9

I keep running into errors on the i686-mingw32-RA-on-linux bot and was curious if someone could test a patch against the bot or something with a similar setup. I believe it should now work properly, but would like to make sure that it'll pass before possibly adding a third commit/revert cycle. If the history isn't an issue, let me know an I'll just keep trying. The differential is