removed cherry pick of review #85714 (merged)