Split win32 specific changes into a new branch and reverted them in master