diff --git a/patches/runtime/0025-Disable-building-Crossgen2-pack.patch b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
new file mode 100644
index 0000000000..e4468f37ec
--- /dev/null
+++ b/patches/runtime/0025-Disable-building-Crossgen2-pack.patch
@@ -0,0 +1,40 @@
+From 1fbaac491061d31b31d5e07490ef9011f01550b7 Mon Sep 17 00:00:00 2001
+From: Davis Goodin <dagood@microsoft.com>
+Date: Tue, 8 Dec 2020 10:36:54 -0600
+Subject: [PATCH] Disable building Crossgen2 pack
+
+---
+ .../pkg/Microsoft.NETCore.App.Crossgen2.pkgproj | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
+index d652108a181..7db441d2bc8 100644
+--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
++++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
+@@ -10,6 +10,23 @@
+     <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
+   </PropertyGroup>
+ 
++  <!--
++    Building the Crossgen2 pack from source has a few issues:
++
++    Self-contained packages like this one bring down lots of prebuilts. We can disable
++    self-contained, but this only fixes this some prebuilts, not all. See
++    https://github.com/dotnet/source-build/issues/1937. Also, disabling self-contained makes the
++    source-built Crossgen2 pack different from the Microsoft build's and potentially not work in the
++    expected scenarios.
++
++    Even if we managed to build it without prebuilts, there is no mechanism to distribute the
++    Crossgen2 pack in distro packages. This is the same problem as runtime packs. See
++    https://github.com/dotnet/source-build/issues/1568
++  -->
++  <PropertyGroup>
++    <SkipBuild>true</SkipBuild>
++  </PropertyGroup>
++
+   <!--
+     Get installer properties, in particular for MSIs.
+     Consider porting to central infrastructure: https://github.com/dotnet/runtime/issues/1867
+-- 
+2.25.4
+
diff --git a/patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch b/patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch
deleted file mode 100644
index 2a5f9dbd8c..0000000000
--- a/patches/runtime/0025-Don-t-build-crossgen2-self-contained.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 86c7842a7723258ef1016ff44785f66b16668bd1 Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Mon, 19 Oct 2020 18:59:36 +0000
-Subject: [PATCH] Don't build crossgen2 self-contained
-
-When self-contained is true, Crossgen2 attemts to download
-Microsoft.NETCore.App.Runtime.linux-x64 with a version matching
-the SDK version of the SDK from global.json
----
- .../projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
-index 7ae30c5..db13cdd 100644
---- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
-+++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
-@@ -68,7 +68,7 @@
-             Targets="Restore"
-             Properties="
-             Configuration=$(RuntimeConfiguration);
--            SelfContained=true;
-+            SelfContained=false;
-             RuntimeIdentifier=$(PackageRID)">
-     <Output TaskParameter="TargetOutputs" ItemName="Crossgen2File" />
-     </MSBuild>
-@@ -79,7 +79,7 @@
-             Configuration=$(RuntimeConfiguration);
-             GenerateDependencyFile=true;
-             IncludeFileVersionsInDependencyFile=false;
--            SelfContained=true;
-+            SelfContained=false;
-             RemoveLongNameDac=true;
-             RuntimeGraphPath=$(LiveRuntimeIdentifierGraphPath);
-             RuntimeIdentifier=$(PackageRID)">
-@@ -90,7 +90,7 @@
-       <File Include="@(Crossgen2File)">
-         <TargetPath>tools</TargetPath>
-       </File>
--      <!-- 
-+      <!--
-         System.Private.CoreLib's R2R pdb ends up in two locations (CoreCLR and the depproj output).
-         Remove them here and let the symbol file location infra find exactly one.
-       -->
--- 
-1.8.3.1
-