Revert "GroupReturn server side fix"

This reverts commit e98ddeb3ba74c67cd4b9b91c56c5ff672dffa0dc.