diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index ac7897fa9..44aaa50a6 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -292,15 +292,13 @@ jobs:
         # TODO this workflow needs cmdline-tools 13.0 (for pixel_fold). Remove when not necessary.
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
-        with:
-          cmdline-tools-version: 11479570
 
-      # android-emulator-runner uses /latest
-      - name: Replace cmdlinetools and set path
-        run: |
-          rm -rf ${{ env.ANDROID_HOME}}/cmdline-tools/latest
-          mv ${{ env.ANDROID_HOME}}/cmdline-tools/11479570 ${{ env.ANDROID_HOME}}/cmdline-tools/latest
-          echo ${{ env.ANDROID_HOME}}/cmdline-tools/latest/bin >> $GITHUB_PATH
+#      # android-emulator-runner uses /latest
+#      - name: Replace cmdlinetools and set path
+#        run: |
+#          rm -rf ${{ env.ANDROID_HOME}}/cmdline-tools/latest
+#          mv ${{ env.ANDROID_HOME}}/cmdline-tools/11479570 ${{ env.ANDROID_HOME}}/cmdline-tools/latest
+#          echo ${{ env.ANDROID_HOME}}/cmdline-tools/latest/bin >> $GITHUB_PATH
 
       # https://github.com/ReactiveCircus/android-emulator-runner/issues/197
       - name: Create directory for AVD