diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b0c9cf3d2..6ae781c17d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,10 +27,11 @@ jobs:
         TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
         echo ~/flutter/bin >> "$GITHUB_PATH"
 
-        # The Flutter tool assumes the tip of tree is "upstream/master":
-        #   https://github.com/flutter/flutter/issues/160558
+        # The Flutter tool assumes the tip of tree is "origin/master"
+        # (or "upstream/master"):
+        #   https://github.com/flutter/flutter/issues/160626
         # TODO(upstream): make workaround unneeded
-        git --git-dir ~/flutter/.git update-ref refs/remotes/upstream/master origin/main
+        git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main
 
     - name: Download Flutter SDK artifacts (flutter precache)
       run: flutter precache --universal