reverted governor changes

Change-Id: I147ccdbe51eb4dbb821700bc6ce8df24cae8bf36