diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index b098d346f79c..204b84ed5a40 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -206,8 +206,6 @@ jobs:
           RUSTFLAGS: --deny warnings
           BUILD_TYPE: debug
         run: |
-          # Temporary fix to address maybenot.h build issues.
-          cargo install --force cbindgen --version "0.26.0"
           ARCHITECTURES="${{ matrix.abi }}"
           UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so"
           STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so"
diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml
index 45a2829f66b8..cfdd75e75176 100644
--- a/.github/workflows/rust-unused-dependencies.yml
+++ b/.github/workflows/rust-unused-dependencies.yml
@@ -81,12 +81,6 @@ jobs:
           git config --global --add safe.directory '*'
           git submodule update --init --recursive --depth=1 wireguard-go-rs
 
-      - name: Install cbindgen
-        run: |
-          # Temporary fix to address maybenot.h build issues.
-          # Remove this step when cbindgen has been added to the build container.
-          cargo install --force cbindgen --version "0.26.0"
-
       - name: Install nightly Rust toolchain
         run: |
           rustup default $RUST_NIGHTLY_TOOLCHAIN
diff --git a/build-apk.sh b/build-apk.sh
index 748baa0946b8..e45d4014c9d4 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -77,14 +77,6 @@ mkdir -p "app/build/extraAssets"
 mkdir -p "app/build/extraJni"
 popd
 
-# Temporary fix to address maybenot.h (checked in) sometimes needing to be
-# re-generated due to how `make` looks at last-modifications while git neither
-# stores nor consistently sets modification metadata on file checkout.
-#
-# NOTE: The version should match the one used in the checked in
-# maybenot.h file.
-cargo install --force cbindgen --version "0.26.0"
-
 for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
     case "$ARCHITECTURE" in
         "x86_64")