Rebase without deleting orders