This reverts commit b5743d47. This causes some minor compile-time impact. Revert for now, better to do the change more gradually.