Minimal Select Server functionality for Windows

I think this change was made by mistake and needs reverting.