fix cruft from rebase