This reverts commit e29292969b. This apparently causes a regression in compile time (ie, it slows down).
e29292969b