re-enable CombineHarvester code that broke gcc in 53X. Use an alternative now that should be safe everywhere