Clean up bad rebase/cherry-pick.