This reverts commit --

77fd432cb24678c2351a7656ddd44339618f9cb6
0d7126641b467f4d33b71c52824c0b384830f1c2
559d205a8c8c0d658fc2e7eacd4d536e5aead4f0
6d8e7398e4a06ee90c0bdbebec3f0290c12b5aa4
b72517bfe9c4b4e3efde5badc95fdf89b0ea48cd

GitOrigin-RevId: 18dc4ce999485ae15d37ae09bd3d799b968fd261