This reverts commit 1fdd270d4148abd0385e4258bb634cf769cce8c5. GitOrigin-RevId: f01e0726b9a0119bc7f8bda3a98c2c0df5026e51