Speed farming fix redone for new centralized code.