Revert janky workaround

When I tried to make the changes in !154 (merged) I had a failure, which was caused by a new file that was just added to the groupdata area.

I added a very ugly workaround since this wasn't a change that I introduced, but rather a new bug. We should remove that workaround.