Automated rollback of PR #21945 END_PUBLIC Automated rollback of commit 863f6141. Revert #21945. PiperOrigin-RevId: 215913175