diff --git a/src/cli.c b/src/cli.c
index da6932f..3783bd6 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1639,9 +1639,10 @@
 				curoff += len;
 			} else
 				tmpbuf[curoff++] = 0;
-			memcpy(tmpbuf + curoff, &l->options,
-			       sizeof(l->options));
-			curoff += sizeof(l->options);
+
+			/* we used to send the listener options here before 2.3 */
+			memset(tmpbuf + curoff, 0, sizeof(int));
+			curoff += sizeof(int);
 
 			i++;
 		} else
@@ -1785,7 +1786,7 @@
 	 *  The namespace name, if any
 	 *  Size of the interface name (or 0 if none), as an unsigned char
 	 *  The interface name, if any
-	 *  Listener options, as an int.
+	 *  32 bits of zeroes (used to be listener options).
 	 */
 	/* We will send sockets MAX_SEND_FD per MAX_SEND_FD, allocate a
 	 * buffer big enough to store the socket information.
diff --git a/src/haproxy.c b/src/haproxy.c
index 5b32522..a8d27f8 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1295,34 +1295,30 @@
 			ha_warning("Inconsistency while transferring sockets\n");
 			goto out;
 		}
-		memcpy(&xfer_sock->options, &tmpbuf[curoff],
-		    sizeof(xfer_sock->options));
-		curoff += sizeof(xfer_sock->options);
+
+		/* we used to have 32 bits of listener options here but we don't
+		 * use them anymore.
+		 */
+		curoff += sizeof(int);
 
 		/* determine the foreign status directly from the socket itself */
-		xfer_sock->options &= ~LI_O_FOREIGN;
 		if (tcp_is_foreign(fd, xfer_sock->addr.ss_family))
 			xfer_sock->options |= LI_O_FOREIGN;
 
 		/* keep only the v6only flag depending on what's currently
 		 * active on the socket, and always drop the v4v6 one.
 		 */
+#if defined(IPV6_V6ONLY)
 		{
 			int val = 0;
-#if defined(IPV6_V6ONLY)
 			socklen_t len = sizeof(val);
 
 			if (xfer_sock->addr.ss_family == AF_INET6 &&
-			    getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) != 0)
-				val = 0;
-#endif
-
-			if (val)
+			    getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) == 0 &&
+			    val > 0)
 				xfer_sock->options |= LI_O_V6ONLY;
-			else
-				xfer_sock->options &= ~LI_O_V6ONLY;
-			xfer_sock->options &= ~LI_O_V4V6;
 		}
+#endif
 
 		xfer_sock->fd = fd;
 		if (xfer_sock_list)