Fix part of a bad rebase