
This reverts commit 6f992efbc51e743a320be4d468b9b8d911797b58. Setuptools 50.1.0 has been released which reverts the breaking behavior. https://review.opendev.org/#/c/749766/ tests that these fixes work in other venvs that exhibited the same problems. That change looks happy so I think this revert is ready to go. Change-Id: I31b62be4f85f40f4d99e463cd961dec0a3542f47