Reverting some group-related changes