This reverts commit 13e4b22daa99b096cf2a9625212a855be59b1fdc. GitOrigin-RevId: f015bc2bb54e98d1271bc2417647638aa80ba843