reduces closure size from ~200mb to ~100mb fixes #29775 (cherry picked from commit 30c380556c)
30c380556c