Update against failed cherry-pick