bpo-43693: Un-revert commits 2c1e258 and b2bf2bc.#26577

ericsnowcurrently merged 2 commits intopython:mainpython/cpython:mainfrom

ericsnowcurrently:unrevert-localsplusnamesericsnowcurrently/cpython:unrevert-localsplusnamesCopy head branch name to clipboard