Fix another rebase gaffe