Improve 76bf791

Puts the fix where it really should be in replace_win32_incompat.

Improves 76bf791c2a990eebe3b1d7620bd002a5999415b0