removed additional groupby
Removed additional groupby. Closes #317

After discussion with Erik, I couldn't rationalize why the additional group_by was necessary.
The tl;dr is we no longer need it....so I removed it

Merge remote-tracking branch 'origin/pr/317' into HEAD