gh-153056: Backport the relevant bits of (#153057)#153373

warsaw wants to merge 1 commit into

python:3.13python/cpython:3.13from

warsaw:warsaw/gh-153057-313bpwarsaw/cpython:warsaw/gh-153057-313bpCopy head branch name to clipboard