Merge "PIP: Fix regressions caused by previous commit a0d4d25" into nyc-dev