Fix previous incomplete rebase