Revert "WIKI-969 Fix the usage of OrganizationService"

This reverts commit db5cfb4487175ddc29e038bab05fac7cf8fc4a03.