Fix rebase gunk left in error.