This reverts commit f817ac652e35e9ed79db8d24c4144460e4cc0f71. GitOrigin-RevId: 80bc280977d25e3ba554c32242fddfb3e15915e6