diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index fe146cf0d..d6e878ad8 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -1674,6 +1674,8 @@ public class MapView extends FrameLayout implements LocationListener {
             }
 
 /*
+            // TODO - Too much overhead on main thread.  Needs to be refactored before it
+            // can be re-enabled
             // Update map position if NOT in NONE mode
             if (userLocationTrackingMode != UserLocationTrackingMode.NONE) {
                 setCenterCoordinate(new LatLng(mGpsLocation));