diff --git a/include/proto/connection.h b/include/proto/connection.h
index 5c72a95ae..ce88f6e6b 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -548,14 +548,10 @@ static inline void conn_get_to_addr(struct connection *conn)
 	conn->flags |= CO_FL_ADDR_TO_SET;
 }
 
-/* Assigns a connection with the appropriate data, ctrl, transport layers, and owner. */
-static inline void conn_assign(struct connection *conn, const struct data_cb *data,
-                               const struct protocol *ctrl, const struct xprt_ops *xprt,
-                               void *owner)
+/* Attaches a connection to an owner and assigns a data layer */
+static inline void conn_attach(struct connection *conn, void *owner, const struct data_cb *data)
 {
 	conn->data = data;
-	conn->ctrl = ctrl;
-	conn->xprt = xprt;
 	conn->owner = owner;
 }
 
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 8fc3281c9..6bedaffcc 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -88,7 +88,8 @@ static inline void si_prepare_conn(struct stream_interface *si, const struct pro
 
 	si->ops = &si_conn_ops;
 	si->end = &conn->obj_type;
-	conn_assign(conn, &si_conn_cb, ctrl, xprt, si);
+	conn_prepare(conn, ctrl, xprt);
+	conn_attach(conn, si, &si_conn_cb);
 }
 
 static inline void si_prepare_applet(struct stream_interface *si, struct si_applet *applet)
diff --git a/src/checks.c b/src/checks.c
index b96f13dc8..ed459120c 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1542,7 +1542,7 @@ static struct task *process_chk(struct task *t)
 		/* prepare a new connection */
 		conn_init(conn);
 		conn_prepare(conn, s->check_common.proto, s->check_common.xprt);
-		conn_assign(conn, &check_conn_cb, s->check_common.proto, s->check_common.xprt, check);
+		conn_attach(conn, check, &check_conn_cb);
 		conn->target = &s->obj_type;
 
 		/* no client address */
diff --git a/src/session.c b/src/session.c
index 9acfa7a08..f8b29d542 100644
--- a/src/session.c
+++ b/src/session.c
@@ -203,7 +203,7 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
 	 * but not initialized. Also note we need to be careful as the stream
 	 * int is not initialized yet.
 	 */
-	conn_assign(cli_conn, &sess_conn_cb, l->proto, l->xprt, s);
+	conn_attach(cli_conn, s, &sess_conn_cb);
 
 	/* finish initialization of the accepted file descriptor */
 	conn_ctrl_init(cli_conn);