This reverts commit cc1c175d078b179e7af730b8617165c6ea6193f3. GitOrigin-RevId: 83814f455af356117a6fccd8b122d72a5d0bce28