Remove cruft from bad rebase.