Revert "Project group by fields in case if we need it"

This reverts commit 80eb8dbd24c73f46d9e487bff4cb3e3048048970.