Revert back to our custom fork of GMap 6.x-1.x (still waiting on stable 2.x branch)