Revert dd4fc01..a879fee

This rolls back to commit dd4fc01d5405db8a84ee1ac33dd1e08044605f11.
add group