Revert "INTEG-374 Fix the usage of OrganizationService"

This reverts commit f79475313b9c875ff0a89a844dbae6122bd107ee.