Revert: Fix group ids (f610f9b)