Revert some of the windows refactoring.