Experimental fix for windows breakage.