Index: src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 17400)
+++ src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(working copy)
@@ -1299,22 +1299,6 @@
             }
         }
 
-        /**
-         * Extend tile loading corridor, so that no flickering happens when panning
-         */
-        private void overloadTiles() {
-            int overload = 1;
-            int minXo = Utils.clamp(minX-overload, tileSource.getTileXMin(zoom), tileSource.getTileXMax(zoom));
-            int maxXo = Utils.clamp(maxX+overload, tileSource.getTileXMin(zoom), tileSource.getTileXMax(zoom));
-            int minYo = Utils.clamp(minY-overload, tileSource.getTileYMin(zoom), tileSource.getTileYMax(zoom));
-            int maxYo = Utils.clamp(maxY+overload, tileSource.getTileYMin(zoom), tileSource.getTileYMax(zoom));
-            for (int x = minXo; x < maxXo; ++x) {
-                for (int y = minYo; y < maxYo; ++y) {
-                    loadTile(getOrCreateTile(x, y, zoom), false);
-                }
-            }
-        }
-
         private void loadAllErrorTiles(boolean force) {
             if (!getDisplaySettings().isAutoLoad() && !force)
                 return;
@@ -1569,9 +1553,6 @@
         g.setColor(Color.DARK_GRAY);
 
         List<Tile> missedTiles = this.paintTileImages(g, ts);
-        if (getDisplaySettings().isAutoLoad()) {
-            ts.overloadTiles();
-        }
         int[] otherZooms = {1, 2, -1, -2, -3, -4, -5};
         for (int zoomOffset : otherZooms) {
             if (!getDisplaySettings().isAutoZoom()) {