Revert.
Added group class as an option.