Revert "Fix detection of host-part in uri for non standard ports" to
have a clean branch

This reverts commit 84050334e605d4f86bc7a5ee8754d764776c81a0.