Fix cherry-pick of 59691