Rollback breaking change. END_PUBLIC Automated rollback of commit 20622daa. Revert #21038. PiperOrigin-RevId: 208256026