Always using eager detection now.

Was improved by a lot in S/C core.