diff --git a/.devcontainer/default/VSCode/_clang-format b/.devcontainer/default/VSCode/_clang-format
deleted file mode 100644
index e3845288a2ae..000000000000
--- a/.devcontainer/default/VSCode/_clang-format
+++ /dev/null
@@ -1 +0,0 @@
-DisableFormat: true
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
index 3972f4235e84..4979bcb8089f 100644
--- a/.github/workflows/buildAndTest.yml
+++ b/.github/workflows/buildAndTest.yml
@@ -43,7 +43,6 @@ jobs:
           # Base ref is the target branch, in text form (not hash)
           PR_BASE: ${{ github.base_ref }}
         run: |
-          # Run clang-format
           if [ -z "$PR_BASE" ]; then
             DIFF_COMMIT_NAME="HEAD^"
           else
@@ -73,6 +72,10 @@ jobs:
         run: |
           # Run clang-format
           git clang-format $DIFF_COMMIT
+          
+          # clang-format unnecessarily formats some JSON in this directory, and disagrees with VSCode's formatting rules
+          git checkout HEAD -- .devcontainer
+
           git diff --ignore-submodules > clang-format.patch
           if [ -s clang-format.patch ]; then
             echo "Clang-format found formatting problems in the following " \