preserve order_date across package changes, #25130