Revert "Make build pass on windows"

This reverts commit 6f496cb5e96975eb8ad0d46f01261d900bd97f5c.
Revert "Make build pass on windows"

This reverts commit 8c7deeec57f48f8f7a3711938d9b3db19d7585bc.