Reverted code that was causing issues with groups (#2090)