This reverts commit a67ea76d5e03e96c1df8a17063aa332e7cb2d1a3. GitOrigin-RevId: c8296444ed68ca30ab330c6e0d6e3b9466f102e0