Once we have tests working on Python 3.15, we should see if the changes in #11112 can be reverted and verify that all our tests continue passing.