This reverts commit 3719f468a6336ff4bf5126f3e5d79dcde172b7ea. GitOrigin-RevId: 6f4809f3c607c62892fc1e110eeaa2a1e7a124a4