Revert "ECMS-6488 Fix the usage of OrganizationService"

This reverts commit 5a673b7924f6dd9c30cb93ba563a75afa284f99a.