no need for gps branch hack anymore

Change-Id: Iff10ae4c1ee04f3af2bd8d5b5e2ef9e9fb02a467