r1906: Revert lukeh's change for primary uid/gid change. This creates a recursion