diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 28a04422c5..4fa99e8789 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,8 +27,6 @@ jobs:
             ghc: '8.8.3' # fails due to segfault
           - os: windows-latest
             ghc: '8.8.2' # fails due to error with Cabal
-          - os: macOS-latest
-            ghc: '8.10.5' # https://gitlab.haskell.org/ghc/ghc/-/issues/19968
         include:
           - os: windows-latest
             ghc: '8.10.2.2' # only available for windows and choco
@@ -74,6 +72,12 @@ jobs:
       run: |
         echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
 
+    - name: Tentative Workaround for GHC 8.10.5 on macOS
+      if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
+      run: |
+        echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
+        sudo rm -rf /Library/Developer/CommandLineTools
+
     - name: Build Server
       # Try building it twice in case of flakey builds on Windows
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0f82955861..2594638f37 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -65,11 +65,6 @@ jobs:
           # This build get stuck frequently
           # - os: windows-latest
           #   ghc: '8.6.4'
-        exclude:
-          # Not able to build 'network' package
-          # See https://gitlab.haskell.org/ghc/ghc/-/issues/19968
-          - os: macOS-latest
-            ghc: '8.10.5'
 
     steps:
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
@@ -98,6 +93,12 @@ jobs:
           echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
+      - name: Tentative Workaround for GHC 8.10.5 on macOS
+        if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
+        run: |
+          echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
+          sudo rm -rf /Library/Developer/CommandLineTools
+
       # Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.ghc == '9.0.1' }}
         name: Use modified cabal.project for ghc9