This reverts commit 568e0bc498. This is working on staging-next since there is an updated pip.
568e0bc498