Last attempt to hack around the winsock issue before I give up

Refs #7769
Merge branch 'feature/7769_NewRemoteAPI' into develop