This reverts commit 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee. GitOrigin-RevId: d5cc2fd2e7a676cad637717d77d1a69a7fe6453c