Fix old cherry-pick