Revert "Try to fix GMap bug"

This reverts commit d4531407b9c06aa5eb506f894344351e3312e431.
Fix GMap ?