Remove the IPv6 retry loop and misc. changes.
IPv6 support: Post review fixes, added comments re. the changes.