Code

revert: plug memory leak in "cherry-pick root commit" codepath