Bug 1110961 - should not try to convert server to host (allows ports and...

... different schemes)