This reverts commit 7d4e8c1f. Contrary to the commit description, this does cause large compile-time regressions (up to 10% on individual files).