Speed farming fix redone for new centralized code.

Fixed speed farming with the new centralized code.