This reverts commit 96061812977d5c854e494cd44163b16a96722b17. GitOrigin-RevId: f30a185b65a4f1346ed13fa0c6e9ea0852d44335