Fix bad cherry-pick.