python3-pip: merge back into python-pip template. This reverts commit 2cae61c3688dff40aa6cafa827008e351db69dc1.