This reverts commit 8b8466fd. This is causing size regressions with -Oz and FullLTO. Revert while I come up with a repro.