Revert "Fix to enable the server to work on Windows"

The master branch will remain in sync with the forked master, and a new branch, win-fix, will be used to patch in the changes that this revert reverts.

This reverts commit 23a19e8c772bf80124430c0dd873a0df3338241e.