diff --git a/.github/actions/clang-format/action.yml b/.github/actions/clang-format/action.yml
deleted file mode 100644
index b81af54f..00000000
--- a/.github/actions/clang-format/action.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Clang Format
-inputs:
-  directory:
-    description: Directory to Lint
-    required: true
-  version:
-    description: LLVM version to use # Should be kept roughly in sync with arcanist
-    required: false
-    default: 12
-
-runs:
-  using: "composite"
-  steps:
-    - name: Install
-      shell: bash
-      run: sudo apt-get install -y clang-format-${{ inputs.version }}
-
-    - name: clang-format
-      working-directory: ${{ inputs.directory }}
-      shell: bash
-      env:
-        BASHOPTS: extglob:nullglob
-      run: clang-format-${{ inputs.version }} --dry-run --Werror **/*.{h,hh,hpp,c,cpp,cc,m,mm}
diff --git a/.github/actions/setup-cpp/action.yml b/.github/actions/setup-cpp/action.yml
index 4f618267..f3aece30 100644
--- a/.github/actions/setup-cpp/action.yml
+++ b/.github/actions/setup-cpp/action.yml
@@ -16,6 +16,7 @@ runs:
       if: ${{ inputs.toolchain == 'Clang' }}
       shell: bash
       run: |
+        sudo apt-get install -y libc++-dev libc++abi-dev
         echo "CC=/usr/bin/clang" >> $GITHUB_ENV
         echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
         echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
diff --git a/.github/workflows/validate-cpp.yml b/.github/workflows/validate-cpp.yml
index e2c159d1..666c1195 100644
--- a/.github/workflows/validate-cpp.yml
+++ b/.github/workflows/validate-cpp.yml
@@ -97,13 +97,3 @@ jobs:
           cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
           cmake --build build
         working-directory: capture
-
-  clang-format:
-    name: Format
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: clang-format
-        uses: ./.github/actions/clang-format