Same change as [9bc120ced2] for UNIX, but for Windows as well.