Index: /trunk/src/org/openstreetmap/josm/gui/bbox/JosmMapViewer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/JosmMapViewer.java	(revision 18451)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/JosmMapViewer.java	(revision 18452)
@@ -92,5 +92,5 @@
 
         protected static final StringProperty DEFAULT_OSM_TILE_URL = new StringProperty(
-                "default.osm.tile.source.url", "https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png");
+                "default.osm.tile.source.url", "https://tile.openstreetmap.org/{zoom}/{x}/{y}.png");
 
         @Override
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java	(revision 18451)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java	(revision 18452)
@@ -118,5 +118,5 @@
         return new String[] {
             "/imagery?id=Bing",
-            "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
+            "/imagery?title=osm&type=tms&url=https://tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
             "/imagery?title=landsat&type=wms&url=http://irs.gis-lab.info/?" +
                     "layers=landsat&SRS=%7Bproj%7D&WIDTH=%7Bwidth%7D&HEIGHT=%7Bheight%7D&BBOX=%7Bbbox%7D",
Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java	(revision 18451)
+++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java	(revision 18452)
@@ -86,9 +86,9 @@
         String url = "https://localhost/imagery?title=osm"
                 + "&type=tms&min_zoom=3&max_zoom=23&category=osmbasedmap&country_code=XA"
-                + "&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png";
+                + "&url=https://tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png";
         ImageryInfo imageryInfo = newHandler(url).buildImageryInfo();
         assertEquals("osm", imageryInfo.getName());
         assertEquals(ImageryInfo.ImageryType.TMS, imageryInfo.getImageryType());
-        assertEquals("https://a.tile.openstreetmap.org/{zoom}/{x}/{y}.png", imageryInfo.getUrl());
+        assertEquals("https://tile.openstreetmap.org/{zoom}/{x}/{y}.png", imageryInfo.getUrl());
         assertEquals(3, imageryInfo.getMinZoom());
         assertEquals(23, imageryInfo.getMaxZoom());