This reverts commit 669ce8b6411309cbab3162cf94bd03399581eeb4. GitOrigin-RevId: 4a3933668a0d01912e748c164581bcb9bbded0dd