diff --git a/debian/changelog b/debian/changelog
index 8d384c154e794358745470169e8e312842e3e896..7e4b9b64402539742fff9172b0afdf0f47df4922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apertis-dev-tools (0.2024.18) apertis; urgency=medium
+
+  * ci-buildpackage: drop the use of wrap-and-sort.
+    This was a workaround for odd nodes packages that apt was not able
+    to parse. This is no longer required since it was fixed in apt 2.3.10.
+    Moreover, this workaround leads to other apt failures to resolve
+    dependencies (because of conflicts between rustc and rustc-web).
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Wed, 15 Jan 2025 18:21:42 +0100
+
 apertis-dev-tools (0.2024.17) apertis; urgency=medium
 
   * apertis-pkg-merge-local: Add new tool.
diff --git a/tools/ci-buildpackage b/tools/ci-buildpackage
index 465e175c15d7b77b1dd1874f6cd9b75337bdea91..970fdc89aa8fc1622300c7edd036e8750e6dfbe3 100755
--- a/tools/ci-buildpackage
+++ b/tools/ci-buildpackage
@@ -11,17 +11,11 @@ set -ex
 
 export DEBIAN_FRONTEND=noninteractive
 
-# Works around node-* packages having Build-Depends apt can't parse
-wrap-and-sort -f debian/control
-
 apt-get -qy update
 apt-get -qy -o APT::Get::Build-Dep-Automatic=yes \
   -o Acquire::http::Pipeline-Depth=0 \
   build-dep "$(pwd)"
 
-# Revert changes made by `wrap-and-sort`
-git checkout debian/
-
 dpkg-checkbuilddeps
 
 dversion="$(dpkg-parsechangelog -S Version)"