9a7f4a768a
This is a rollback of f937ffd93326b2964e33689b0dc6024124776a9e. PiperOrigin-RevId: 507456400 Change-Id: I2026510e6065eb440c0c899fcc5a2cc8ff5afd49