diff --git a/.github/actions/define-llvm-env/README.md b/.github/actions/define-llvm-env/README.md
deleted file mode 100644
index 3a9f5fc8ec79..000000000000
--- a/.github/actions/define-llvm-env/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# define-llvm-env
-
-Defines `DWARFDUMP` and `LLDB` path executable.
diff --git a/.github/actions/define-llvm-env/action.yml b/.github/actions/define-llvm-env/action.yml
deleted file mode 100644
index 168054a04fe5..000000000000
--- a/.github/actions/define-llvm-env/action.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Set up a DWARFDUMP env'
-description: 'Set up a DWARFDUMP env (see tests/all/debug/dump.rs)'
-
-runs:
-  using: node12
-  main: 'main.js'
diff --git a/.github/actions/define-llvm-env/main.js b/.github/actions/define-llvm-env/main.js
deleted file mode 100755
index 8fc14e5d184c..000000000000
--- a/.github/actions/define-llvm-env/main.js
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-
-function set_env(name, val) {
-  fs.appendFileSync(process.env['GITHUB_ENV'], `${name}=${val}\n`)
-}
-
-// On OSX pointing to brew's LLVM location.
-if (process.platform == 'darwin') {
-  set_env("DWARFDUMP", "/usr/local/opt/llvm/bin/llvm-dwarfdump");
-  set_env("LLDB", "/usr/local/opt/llvm/bin/lldb");
-}
-
-// On Linux pointing to specific version
-if (process.platform == 'linux') {
-  set_env("DWARFDUMP", "/usr/bin/llvm-dwarfdump-9");
-  set_env("LLDB", "/usr/bin/lldb-9");
-}
diff --git a/.github/actions/install-rust/main.js b/.github/actions/install-rust/main.js
index 2de34dbf16cf..b144d70aea43 100644
--- a/.github/actions/install-rust/main.js
+++ b/.github/actions/install-rust/main.js
@@ -6,11 +6,10 @@ function set_env(name, val) {
   fs.appendFileSync(process.env['GITHUB_ENV'], `${name}=${val}\n`)
 }
 
-if (process.platform === 'darwin') {
-  child_process.execSync(`curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=none --profile=minimal`);
-  const bindir = `${process.env.HOME}/.cargo/bin`;
-  fs.appendFileSync(process.env['GITHUB_PATH'], `${bindir}\n`);
-  process.env.PATH = `${process.env.PATH}:${bindir}`;
+// Needed for now to get 1.24.2 which fixes a bug in 1.24.1 that causes issues
+// on Windows.
+if (process.platform === 'win32') {
+  child_process.execFileSync('rustup', ['self', 'update']);
 }
 
 child_process.execFileSync('rustup', ['set', 'profile', 'minimal']);
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f9a670e50d62..2edfd9980509 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
     branches: [main]
     tags-ignore: [dev]
   pull_request:
-    branches: [main]
+    branches: [main, stable-v0.26]
 defaults:
   run:
     shell: bash
@@ -233,7 +233,6 @@ jobs:
     - uses: ./.github/actions/install-rust
       with:
         toolchain: ${{ matrix.rust }}
-    - uses: ./.github/actions/define-llvm-env
 
     - name: Install libclang
       # Note: libclang is pre-installed on the macOS and linux images.
@@ -276,21 +275,18 @@ jobs:
 
     # Test debug (DWARF) related functionality.
     - run: |
-        sudo apt-get update && sudo apt-get install -y gdb lldb
+        sudo apt-get update && sudo apt-get install -y gdb lldb llvm
         cargo test test_debug_dwarf -- --ignored --test-threads 1
       if: matrix.os == 'ubuntu-latest'
       env:
         RUST_BACKTRACE: 1
-        LLDB: /usr/bin/lldb
 
     # Test debug (DWARF) related functionality on new backend.
     - run: |
-        sudo apt-get update && sudo apt-get install -y gdb lldb
         cargo test test_debug_dwarf -- --ignored --test-threads 1 --test debug::
       if: matrix.os == 'ubuntu-latest'
       env:
         RUST_BACKTRACE: 1
-        LLDB: /usr/bin/lldb
 
     # Test uffd functionality on Linux
     - run: |
@@ -310,7 +306,7 @@ jobs:
         RUST_BACKTRACE: 1
 
   # Perform all tests (debug mode) for `wasmtime` with the old x86 backend.
-  test_x64:
+  test_x86:
     name: Test old x86 backend
     runs-on: ubuntu-latest
     steps:
@@ -320,7 +316,6 @@ jobs:
     - uses: ./.github/actions/install-rust
       with:
         toolchain: stable
-    - uses: ./.github/actions/define-llvm-env
 
     # Install wasm32 targets in order to build various tests throughout the
     # repo.
diff --git a/deny.toml b/deny.toml
index d9baefa13683..f0371bd476e3 100644
--- a/deny.toml
+++ b/deny.toml
@@ -14,6 +14,7 @@ vulnerability = "deny"
 unmaintained = "deny"
 yanked = "deny"
 ignore = [
+    "RUSTSEC-2021-0064"
 ]
 
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html