Revert "Revert "Windows build quick fix""

This reverts commit 47d3e51fbe8c3f5e07337a1ab0b49e37f7fb96ca.