GPU: Revert tweaks to GPU Governing

Change-Id: I148a18e36b6fd95a0e65537951fe9e875c3a47fb