This reverts commit f19d02674f7d0d47531be7586bc47628601a7231. GitOrigin-RevId: 13e4b22daa99b096cf2a9625212a855be59b1fdc