diff --git a/7_hardware-compatibility/7_4_data-connectivity.md b/7_hardware-compatibility/7_4_data-connectivity.md
index 6f823fa..7c0b7a4 100644
--- a/7_hardware-compatibility/7_4_data-connectivity.md
+++ b/7_hardware-compatibility/7_4_data-connectivity.md
@@ -364,55 +364,40 @@
 at least one data standard capable of 200Kbit/sec or greater. Examples of
     technologies that satisfy this requirement include EDGE, HSPA, EV-DO,
     802.11g, Ethernet, Bluetooth PAN, etc.
-*   SHOULD also include support for at least one common wireless data
-standard, such as 802.11 (Wi-Fi) when a physical networking standard (such as
-Ethernet) is the primary data connection
-*   MAY implement more than one form of data connectivity.
 *   [C-0-2] MUST include an IPv6 networking stack and support IPv6
 communication using the managed APIs, such as `java.net.Socket` and
 `java.net.URLConnection`, as well as the native APIs, such as `AF_INET6`
 sockets.
 *   [C-0-3] MUST enable IPv6 by default.
    *   MUST ensure that IPv6 communication is as reliable as IPv4, for example.
-      *   [C-0-4] MUST maintain IPv6 connectivity in doze mode.
-      *   [C-0-5] Rate-limiting MUST NOT cause the device to lose IPv6
-      connectivity on any IPv6-compliant network that uses RA lifetimes of
-      at least 180 seconds.
-
-When connected to an IPv6-capable network:
-
-*   [C-1-1] devices MUST provide applications with direct IPv6 connectivity to
-the network, without any form
-of address or port translation happening locally on the device. Both managed
-APIs such as
-[`Socket#getLocalAddress`](https://developer.android.com/reference/java/net/Socket.html#getLocalAddress%28%29)
-or
-[`Socket#getLocalPort`](https://developer.android.com/reference/java/net/Socket.html#getLocalPort%28%29))
-and NDK APIs such as `getsockname()` or `IPV6_PKTINFO` MUST return the IP
-address and port that is actually used to send and receive packets on the
-network.
+   *   [C-0-4] MUST maintain IPv6 connectivity in doze mode.
+   *   [C-0-5] Rate-limiting MUST NOT cause the device to lose IPv6
+   connectivity on any IPv6-compliant network that uses RA lifetimes of
+   at least 180 seconds.
+*   SHOULD also include support for at least one common wireless data
+standard, such as 802.11 (Wi-Fi) when a physical networking standard (such as
+Ethernet) is the primary data connection.
+*   MAY implement more than one form of data connectivity.
 
 
 The required level of IPv6 support depends on the network type, as follows:
 
 If devices implementations support Wi-Fi networks, they:
 
-*   [C-2-1] MUST support dual-stack and IPv6-only operation on Wi-Fi.
+*   [C-1-1] MUST support dual-stack and IPv6-only operation on Wi-Fi.
 
-If device implementations support Ethernet networks, they:
+If device impelementations support Ethernet networks, they:
 
-*   [C-3-1] MUST support dual-stack operation on Ethernet.
+*   [C-2-1] MUST support dual-stack operation on Ethernet.
 
 If device implementations support cellular data, they:
 
-*   [C-4-1] SHOULD support IPv6 operation (IPv6-only and possibly dual-stack) on
+*   [C-3-1] MUST simultaneously meet these requirements on each network to which
+it is connected when a device is simultaneously connected to more than one
+network (e.g., Wi-Fi and cellular data).
+*   SHOULD support IPv6 operation (IPv6-only and possibly dual-stack) on
 cellular data.
 
-When devices are simultaneously connected to more than one network, (e.g., Wi-Fi
-and cellular data), they:
-*   [C-5-1] MUST simultaneously meet these requirements on each network to which
-they are connected.
-
 
 ### 7.4.6\. Sync Settings