[3.7] Revert unneccessary changes made in bpo-30296 and apply other improvements. (GH-2624)#5908

miss-islington merged 1 commit into

python:3.7python/cpython:3.7from

miss-islington:backport-3f2e6f1-3.7miss-islington/cpython:backport-3f2e6f1-3.7Copy head branch name to clipboard