Revert "The factory is now a private service"

This reverts commit c1a0fef963ce6c99600e11df0f37af9f97f6ef1d.