diff --git a/include/common/buffer.h b/include/common/buffer.h
index 590078c..0218afa 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -394,15 +394,6 @@
 	buf->p += n;
 }
 
-/* Tries to realign the given buffer. */
-static inline void buffer_realign(struct buffer *buf)
-{
-	if (!(buf->i | buf->o)) {
-		/* let's realign the buffer to optimize I/O */
-		buf->p = buf->data;
-	}
-}
-
 /* Schedule all remaining buffer data to be sent. ->o is not touched if it
  * already covers those data. That permits doing a flush even after a forward,
  * although not recommended.
diff --git a/src/channel.c b/src/channel.c
index 3770502..7235ffc 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -91,7 +91,7 @@
 		return -2;
 	}
 
-	buffer_realign(chn->buf);
+	c_realign_if_empty(chn);
 	max = bo_contig_space(chn->buf);
 	if (len > max)
 		return max;
diff --git a/src/proto_http.c b/src/proto_http.c
index 4fd5aeb..c447929 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -8318,7 +8318,7 @@
 		s->res.buf->i = 0;
 
 	/* Now we can realign the response buffer */
-	buffer_realign(s->res.buf);
+	c_realign_if_empty(&s->res);
 
 	s->req.rto = strm_fe(s)->timeout.client;
 	s->req.wto = TICK_ETERNITY;