This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5. GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e