Seems like this is intermittently failing, since #30807 was merged? i.e https://cirrus-ci.com/task/4893652609138688?logs=ci#L3674. Seeing the same failure in PRs with unrelated changes, i.e https://cirrus-ci.com/task/5740917921939456.