Remove reference to gid

It no longer exists.

Change-Id: Ib4e69bc7c0fe5642baba3802e47b84ba215452e5