This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a. GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304