Fix bad import from rebase