Merge "Revert "Reduce amount of robot minions allowed""