This reverts commit 8cc8e5d6. This reverts commit dae55c89. Causes major compile-time regressions for unoptimized builds.