r21189: include the primary gid (left out of last commit)