Revert "uid/gid changed to owner/group as suggested by jhoblitt"

This reverts commit cb33d8b254e0c034112faeb851d7094bc3772cd8.