Use for Canada as well.
Reassign shipp_address_id in an after_commit callback on Order