diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 183a2a32f..764714758 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -123,7 +123,8 @@ jobs:
           cd engine
           export SURFER_PLATFORM="darwin"
           export PATH="$(python3 -m site --user-base)/bin":$PATH
-          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes
+          # Always exist with 0, even if bootstrap fails
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes --exclude macos-sdk || true
           cd ..
 
       - name: Build language packs
diff --git a/src/firefox-patches/ff139-mac-sdk-upgrade.patch b/src/firefox-patches/ff139-mac-sdk-upgrade.patch
deleted file mode 100644
index 841a8f31c..000000000
--- a/src/firefox-patches/ff139-mac-sdk-upgrade.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/taskcluster/kinds/toolchain/macos-sdk.yml b/taskcluster/kinds/toolchain/macos-sdk.yml
---- a/taskcluster/kinds/toolchain/macos-sdk.yml
-+++ b/taskcluster/kinds/toolchain/macos-sdk.yml
-@@ -30,24 +30,24 @@
-             - Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk
-         toolchain-artifact: project/gecko/mac-sdk/MacOSX13.3.sdk.tar.zst
-         toolchain-alias:
-             - MacOSX13.3.sdk
- 
--macosx64-sdk-15.2:
--    description: "MacOSX15.2 SDK"
-+macosx64-sdk-15.4:
-+    description: "MacOSX15.4 SDK"
-     treeherder:
--        symbol: TM(sdk15.2)
-+        symbol: TM(sdk15.4)
-     run:
-         arguments:
--            - https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg
--            - 3370660f3e5c9f422a013afcf12fa2ba93b4da3ab8d0a2b2c18e978c55d4da4cb16322ca5afd8b04de0229a2960065f71421258e9d4f1413c039bcc9f1a07a65
--            - Library/Developer/CommandLineTools/SDKs/MacOSX15.2.sdk
--        toolchain-artifact: project/gecko/mac-sdk/MacOSX15.2.sdk.tar.zst
-+            - https://swcdn.apple.com/content/downloads/10/32/082-12052-A_AHPGDY76PT/1a419zaf3vh8o9t3c0usblyr8eystpnsh5/CLTools_macOSNMOS_SDK.pkg
-+            - fd01c70038dbef48bd23fb8b7d18f234910733635f1b44518e71a66d2db92a70180e6a595c6bdd837fa8df7e9b297e570560842e9a6db863840bd051fe69fea5
-+            - Library/Developer/CommandLineTools/SDKs/MacOSX15.4.sdk
-+        toolchain-artifact: project/gecko/mac-sdk/MacOSX15.4.sdk.tar.zst
-         toolchain-alias:
-             - macosx64-sdk
-             - macosx64-sdk-toolchain
--            - MacOSX15.2.sdk
-+            - MacOSX15.4.sdk
- 
- ios-sdk-17.4:
-     description: "iPhoneOS17.4 SDK"
-     treeherder:
-         symbol: TM(ios17.4)