Stop setting order_id when returning shipments