Revert 4a982eb984cf
imported patch mn_windows