Introduce buildId and add SupervisorD the old way again until PIP is installed