This reverts commit b32b2d62d0f9145e5c59b8984b44940c855a1d91. GitOrigin-RevId: 81a4d3bc292d89dabf9f292f2d08e3ee7b69a509