4fd400994a
This reverts commit ec111e24e5.
Reason for revert: pip regressions — I'll do a quick revert for now
Change-Id: Ie91bae447acd9813188a5ba0caebeca30db348ea
Fixes: 379800273
Fixes: 379602904
Bug: 354627538