Fix a rebase mistake