Rolling back an earlier change which breaks some deps. END_PUBLIC Automated rollback of commit 7fa9d6a1 PiperOrigin-RevId: 224009307