diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc2f7e8..439dcce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,14 +14,14 @@ jobs:
         # Build non-bzlmod, native
         - { name: "windows     - native",    os: windows-2022,   java_arch: "x64",     command: "test",   config: "--noenable_bzlmod --config=windows",     bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "windows arm - native",    os: windows-2022,   java_arch: "x64",     command: "build",  config: "--noenable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu      - native",    os: ubuntu-22.04,   java_arch: "x64",     command: "test",   config: "--noenable_bzlmod --config=linux",       bazel_options: "",                                 }
-        - { name: "macos       - native",    os: macos-14,       java_arch: "aarch64", command: "test",   config: "--noenable_bzlmod --config=macos",       bazel_options: "",                                 }
+        # - { name: "ubuntu      - native",    os: ubuntu-22.04,   java_arch: "x64",     command: "test",   config: "--noenable_bzlmod --config=linux",       bazel_options: "",                                 }
+        # - { name: "macos       - native",    os: macos-14,       java_arch: "aarch64", command: "test",   config: "--noenable_bzlmod --config=macos",       bazel_options: "",                                 }
 
         # Build bzlmod, native
         - { name: "windows     - bzlmod native", os: windows-2022,   java_arch: "x64",     command: "test",   config: "--enable_bzlmod --config=windows",     bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "windows arm - bzlmod native", os: windows-2022,   java_arch: "x64",     command: "build",  config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu      - bzlmod native", os: ubuntu-22.04,   java_arch: "x64",     command: "test",   config: "--enable_bzlmod --config=linux",       bazel_options: "",                                 }
-        - { name: "macos       - bzlmod native", os: macos-14,       java_arch: "aarch64", command: "test",   config: "--enable_bzlmod --config=macos",       bazel_options: "",                                 }
+        # - { name: "ubuntu      - bzlmod native", os: ubuntu-22.04,   java_arch: "x64",     command: "test",   config: "--enable_bzlmod --config=linux",       bazel_options: "",                                 }
+        # - { name: "macos       - bzlmod native", os: macos-14,       java_arch: "aarch64", command: "test",   config: "--enable_bzlmod --config=macos",       bazel_options: "",                                 }
 
     name: "Build - ${{ matrix.name }}"
     runs-on: ${{ matrix.os }}
@@ -55,13 +55,13 @@ jobs:
         include:
         # Build non-bzlmod, roborio
         - { name: "windows - roborio",         os: windows-2022, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - roborio",         os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "",                                 }
-        - { name: "macos   - roborio",         os: macos-14,     java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "",                                 }
+        # - { name: "ubuntu  - roborio",         os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "",                                 }
+        # - { name: "macos   - roborio",         os: macos-14,     java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "",                                 }
 
         # Build bzlmod, roborio
       # - { name: "windows - bzlmod roborio",  os: windows-2022, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bzlmod roborio",  os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "",                                 }
-        - { name: "macos   - bzlmod roborio",  os: macos-14,     java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "",                                 }
+        # - { name: "ubuntu  - bzlmod roborio",  os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "",                                 }
+        # - { name: "macos   - bzlmod roborio",  os: macos-14,     java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "",                                 }
     name: "Build - ${{ matrix.name }}"
     runs-on: ${{ matrix.os }}
     steps:
@@ -91,13 +91,13 @@ jobs:
         include:
         # Build non-bzlmod, bullseye32
         - { name: "windows - bullseye32",         os: windows-2022, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bullseye32",         os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
-        - { name: "macos   - bullseye32",         os: macos-14,     java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        # - { name: "ubuntu  - bullseye32",         os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        # - { name: "macos   - bullseye32",         os: macos-14,     java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
 
         # Build bzlmod, bullseye32
         - { name: "windows - bzlmod bullseye32",  os: windows-2022, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bzlmod bullseye32",  os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "",                                 }
-        - { name: "macos   - bzlmod bullseye32",  os: macos-14,     java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        # - { name: "ubuntu  - bzlmod bullseye32",  os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        # - { name: "macos   - bzlmod bullseye32",  os: macos-14,     java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "",                                 }
     name: "Build - ${{ matrix.name }}"
     runs-on: ${{ matrix.os }}
     steps:
@@ -128,13 +128,13 @@ jobs:
         include:
         # Build non-bzlmod, bullseye32:
         - { name: "windows - bullseye64",         os: windows-2022,   java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bullseye64",         os: ubuntu-22.04,   java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "",                                 }
-        - { name: "macos   - bullseye64",         os: macos-14,       java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        # - { name: "ubuntu  - bullseye64",         os: ubuntu-22.04,   java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "",                                 }
+        # - { name: "macos   - bullseye64",         os: macos-14,       java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
 
         # Build bzlmod, bullseye32:
         - { name: "windows - bzlmod bullseye64",  os: windows-2022,   java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bzlmod bullseye64",  os: ubuntu-22.04,   java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "",                                 }
-        - { name: "macos   - bzlmod bullseye64",  os: macos-14,       java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "",                                 }
+        # - { name: "ubuntu  - bzlmod bullseye64",  os: ubuntu-22.04,   java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "",                                 }
+        # - { name: "macos   - bzlmod bullseye64",  os: macos-14,       java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "",                                 }
     name: "Build - ${{ matrix.name }}"
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/0001-Fixup-runtime.patch b/0001-Fixup-runtime.patch
index 056a3c9..08fcc68 100644
--- a/0001-Fixup-runtime.patch
+++ b/0001-Fixup-runtime.patch
@@ -1,9 +1,3 @@
-From 37f2d9daad2d469b1d1228c7dc3ca80512ff2f2f Mon Sep 17 00:00:00 2001
-From: PJ Reiniger <pj.reiniger@gmail.com>
-Date: Fri, 18 Oct 2024 01:03:22 -0400
-Subject: Fixup runtime
-
-
 diff --git a/bin/concrt140.dll b/bin/concrt140.dll
 new file mode 100644
 index 0000000000000000000000000000000000000000..235eced6afc0cbc750bd28fea23916f22e741c64
@@ -20099,6 +20093,3 @@ lNfU4SaAx_9J`V#bc#qX4?76i++0i{ez?p&_(hH9He*g=V^@jie
 literal 0
 HcmV?d00001
 
--- 
-2.38.1.windows.1
-