Changes to em-winrm probably should not go into this pull request