Merge "Revert "DO NOT hardcode pyhosted in pip install""