diff --git a/build/build-clang/clang-16.json b/build/build-clang/clang-16.json
index 2691ef03af20..06d1cb1f960c 100644
--- a/build/build-clang/clang-16.json
+++ b/build/build-clang/clang-16.json
@@ -5,6 +5,7 @@
         "unpoison-thread-stacks_clang_10.patch",
         "downgrade-mangling-error_clang_12.patch",
         "fuzzing_ccov_build_clang_12.patch",
+        "partial-revert-llvmorg-16-init-17151-gaa0883b59ae1.patch",
         "partial-revert-llvmorg-16-init-15775-g1ae7d83803e4.patch",
         "revert-llvmorg-16-init-11301-g163bb6d64e5f.patch",
         "revert-llvmorg-16-init-7598-g54bfd0484615.patch",
diff --git a/build/build-clang/clang-trunk.json b/build/build-clang/clang-trunk.json
index 2f16d7c0d75c..088f86d65dfd 100644
--- a/build/build-clang/clang-trunk.json
+++ b/build/build-clang/clang-trunk.json
@@ -7,6 +7,7 @@
         "fuzzing_ccov_build_clang_12.patch",
         "partial-revert-llvmorg-17-init-7686-g244be0b0de19.patch",
         "revert-llvmorg-17-init-4120-g02e8eb1a438b.patch",
+        "partial-revert-llvmorg-16-init-17151-gaa0883b59ae1.patch",
         "partial-revert-llvmorg-16-init-15775-g1ae7d83803e4_clang_17.patch",
         "revert-llvmorg-16-init-11301-g163bb6d64e5f_clang_17.patch",
         "revert-llvmorg-16-init-7598-g54bfd0484615.patch",
diff --git a/build/build-clang/partial-revert-llvmorg-16-init-17151-gaa0883b59ae1.patch b/build/build-clang/partial-revert-llvmorg-16-init-17151-gaa0883b59ae1.patch
new file mode 100644
index 000000000000..4a985e720ef8
--- /dev/null
+++ b/build/build-clang/partial-revert-llvmorg-16-init-17151-gaa0883b59ae1.patch
@@ -0,0 +1,13 @@
+diff --git a/lld/MachO/LTO.cpp b/lld/MachO/LTO.cpp
+index 2f5e9d06f396..7fbb41bef53d 100644
+--- a/lld/MachO/LTO.cpp
++++ b/lld/MachO/LTO.cpp
+@@ -65,8 +65,6 @@ static lto::Config createConfig() {
+     pm.add(createObjCARCContractPass());
+   };
+ 
+-  c.AlwaysEmitRegularLTOObj = !config->ltoObjPath.empty();
+-
+   c.TimeTraceEnabled = config->timeTraceEnabled;
+   c.TimeTraceGranularity = config->timeTraceGranularity;
+   c.OptLevel = config->ltoo;