Revert "Corrected performance issue in groupings fetching (2)"

This reverts commit 7108e11f89cd6f943082679455aab96ce64dff01.
Revert "Corrected performance issue in groupings fetching"

This reverts commit 5d07239d8395b2efc5c73bbac42da5341066f4bc.