bpo-38997: Revert commits 6e157fa and 5df5dbe#17509

pablogsal wants to merge 2 commits into

python:masterpython/cpython:masterfrom

pablogsal:revertpablogsal/cpython:revertCopy head branch name to clipboard