Fix the windows build on master
[APPROVAL] pending/master/fix-windows-build-failures to master