diff --git a/buildbot_treble.sh b/buildbot_treble.sh
index 475771e..86c02af 100755
--- a/buildbot_treble.sh
+++ b/buildbot_treble.sh
@@ -46,6 +46,9 @@ bash ~/treble_experimentations/apply-patches.sh treble_patches
 echo ""
 
 echo "Applying universal patches"
+cd build/make
+git am $BL/patches/0001-Make-broken-copy-headers-the-default.patch
+cd ../..
 cd frameworks/base
 git am $BL/patches/0001-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
 git am $BL/patches/0001-UI-Disable-wallpaper-zoom.patch
@@ -68,6 +71,7 @@ git revert 0e369f42b82c4d12edba9a46dd20bee0d4b783ec --no-edit # recovery: Allow
 cd ../..
 cd build/make
 git am $BL/patches/0001-build-Don-t-handle-apns-conf.patch
+git revert 78c28df40f72fdcbe3f82a83828060ad19765fa1 --no-edit # mainline_system: Exclude vendor.lineage.power@1.0 from artifact path requirements
 cd ../..
 cd device/phh/treble
 git revert 82b15278bad816632dcaeaed623b569978e9840d --no-edit # Update lineage.mk for LineageOS 16.0
diff --git a/patches/0001-Make-broken-copy-headers-the-default.patch b/patches/0001-Make-broken-copy-headers-the-default.patch
new file mode 100644
index 0000000..7ba9af5
--- /dev/null
+++ b/patches/0001-Make-broken-copy-headers-the-default.patch
@@ -0,0 +1,28 @@
+From 0b2cba3481e11b62a98bdc6590641dd5c5e685e1 Mon Sep 17 00:00:00 2001
+From: Alexander Koskovich <zvnexus@outlook.com>
+Date: Sat, 3 Oct 2020 14:28:35 -0700
+Subject: [PATCH] Make broken copy headers the default.
+
+ * Do not take this for S unless needed, this is a hack
+   for this cycle.
+
+Change-Id: I55c8897d7d4d5c2a9e62b1a931b3856b2e38956e
+---
+ core/board_config.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/core/board_config.mk b/core/board_config.mk
+index 86162b6f3..d152bdff6 100644
+--- a/core/board_config.mk
++++ b/core/board_config.mk
+@@ -113,6 +113,7 @@ endif
+ # ###############################################################
+ $(foreach v,$(_build_broken_var_list),$(eval $(v) :=))
+ BUILD_BROKEN_NINJA_USES_ENV_VARS :=
++BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
+ 
+ # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)
+ # or under vendor/*/$(TARGET_DEVICE).  Search in both places, but
+-- 
+2.25.1
+