Fix bad rebase.