This reverts commit 034ae6fa4d8515944683395ef14d99801829cb6a. GitOrigin-RevId: 16801e6f35e1ee879d36ca46e262f8bb6e506a54