revert: fix tiny memory leak in cherry-pick --ff