Merge "Revert "Be more agressive trying to install requirements.""