This reverts commit feea5db0. This causes significant compile-time regressions, even if EGPR is not used.