Fix Windows build fix backport broken on 2.3