Intentionally left out as a separate commit, so it can be reverted once Python 2 support is dropped.
This is needed to be able to use pip 19.3+ in ensurepip of older Pythons without patching all the Pythons.