Fix cherry-pick failure