Preserve rebase