Manual revert of 7859c10a7511b96a67e7466c69a3c6a3ad575988.

Resource don't fetch the GID by default, resulting in GID always getting cleared
when the resource replayed the change and sets the RID. The change was
introduced for the google resource.