Revert unneccessary changes made in bpo-30296 and apply other improvements. (GH-2624)

4 files changed