Revert "Fix windows build"

This reverts commit 93aa08b7557543074a547c4ec113460964947b53.
Fix VS build.