Revert "Windows Bugfixes"

This reverts commit 3f6522254321c0a76bec8bea5a7f435d9fd373d0.