This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae. GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda