Revert "PLF-6115 Fix the usage of OrganizationService"

This reverts commit 326fe20396a1341b65406fe84c7c51599c4d5476.