Fix up the rebase.