@@ -468,15 +468,13 @@ async def wait_for(fut, timeout):
        try:
            await waiter
        except exceptions.CancelledError:
-            if fut.done():
-                return fut.result()
-            else:
-                fut.remove_done_callback(cb)
                # We must ensure that the task is not running
                # after wait_for() returns.
                # See https://bugs.python.org/issue32751
                await _cancel_and_wait(fut, loop=loop)
-                raise

        if fut.done():
            return fut.result()

@@ -289,6 +289,60 @@ async def test_cancel_blocking_wait_for(self):
    async def test_cancel_wait_for(self):
        await self._test_cancel_wait_for(60.0)


if __name__ == '__main__':
    unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-10-26-06-51-59.gh-issue-86296.l1MdXh.rst b/Misc/NEWS.d/next/Library/2022-10-26-06-51-59.gh-issue-86296.l1MdXh.rst
@@ -0,0 +1 @@