This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248. GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a