diff --git a/debian/changelog b/debian/changelog
index 59840cff..6eda3383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * Fix stripping build flags on Ubuntu/ppc64el.
   * libclang1-17: Only encode the major version in the soname. Closes: #1056126.
   * libclang1-17: Provide a symlink for the last soname with the full version.
+  * Restore the patch for D148945, searching /usr/lib/llvm-17/lib by default.
+    Closes: #1056580.
 
   [ Sylvestre Ledru ]
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff
new file mode 100644
index 00000000..73426bdb
--- /dev/null
+++ b/debian/patches/D148945-revert.diff
@@ -0,0 +1,21 @@
+Restore that for now, we're not GenToo ...
+
+https://reviews.llvm.org/D148945
+https://reviews.llvm.org/D122444
+
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -333,6 +333,13 @@ Linux::Linux(const Driver &D, const llvm
+ 
+   Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths);
+ 
++  // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs
++  // libc++.so in D.Dir+"/../lib/". Detect this path.
++  // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported.
++  if (StringRef(D.Dir).startswith(SysRoot) &&
++      D.getVFS().exists(D.Dir + "/../lib/libc++.so"))
++    addPathIfExists(D, D.Dir + "/../lib", Paths);
++
+   addPathIfExists(D, concat(SysRoot, "/lib"), Paths);
+   addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 633aba14..20770031 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -150,3 +150,4 @@ link-grpc.diff
 D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
+D148945-revert.diff