Reverted ComponentFactory collection change