This should be a pure refactor to simplify the logic a bit now that we
no longer probe for IPv6 support.