Revert "Windows build quick fix"

This reverts commit e1175e2e248eaaab7d01357bf8379ffd3199901f.