pt-81810318: removed NFE generic type from factory.