See https://github.com/python-trio/trio/pull/3398, basically just recreate that + fix the tests + a newsfragment.
See #3398, basically just recreate that + fix the tests + a newsfragment.