This reverts commit 423e6683d3f2b142fba581374f6d250b57271550. GitOrigin-RevId: a1ed07c9b2018501a9d8b4fa9924c90f03c1cb79