Fix a broken rebase