Reworking networking to avoid v4/v6 problem