Merge "Revert "Cap Pip<8 due to pip bug""