Pull request #118858 was submitted and merged by
@jmagman in order to revert changes made in this pull request #118421.

Please assign this issue to the person that will make the formal review on the
revert request listed above.

Please do the following so that we may track this issue to completion:

1. Add the reviewer of revert pull request as the assignee of this issue.
2. Close only when the review has been completed.