This reverts commit 1a89abceeadb6e1c53b4bc779df19b6723eab738. GitOrigin-RevId: 05025068f75f1012626359230952e252e941d675