bpo-32999: Revert GH-6002 (fc7df0e6) (GH-6189) (GH-6190)

bpo-33018 (GH-5944) fixed bpo-32999 too.  So fc7df0e6 is not required
anymore.  Revert it except test case.
(cherry picked from commit f757b72b2524ce3451d2269f0b8a9f0593a7b27f)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
1 file changed