Merge "Revert "Implement a basic PipController for pip2 3/3"" into main