Revert "Refactor multiple entry points into a single factory entry group process"

This reverts commit 389434894d45491a523d0d5a25f853b1d1ca25c9.