option to make ship_company field available again, #25782