This reverts commit dd0700ff1d. We will need G3 patch cleanup before this one can land. PR Close #56031
dd0700ff1d