More reverts to auto color (follow up to 03d0654a7ed3a2cfae79bb6bc34bdbc202456d88)