Revert "Win copmilation fixes."

This reverts commit 97fb31913c7c1caacbb8d27af6d923fe14c0699e.
Revert "Win compilation fixes"

This reverts commit 8d82a272c6588f40418dcc1772312f86a1d13de1.