Revert Windows and Enterprise as per comments in pull request #391