Fix a rebase oops