This reverts commit 61bfba3a05780ec0b3a3461bba50cca6474a1274. GitOrigin-RevId: d0ffcb9a13e9597cebf95961c0c50ef8f950dd7a