This reverts commit e5581df6. This causes major compile-time regressions, about 2-3% end-to-end on CTMark.