Fixup my rebase gaffe