Correct a cherry-pick error