diff --git a/plugins/layer_types/openlayers_layer_type_geojson.js b/plugins/layer_types/openlayers_layer_type_geojson.js
index 12b2662..9c89d3b 100644
--- a/plugins/layer_types/openlayers_layer_type_geojson.js
+++ b/plugins/layer_types/openlayers_layer_type_geojson.js
@@ -12,7 +12,6 @@ Drupal.openlayers.layer.geojson = function(title, map, options) {
   var features = null;
   options.projection = 'EPSG:' + options.projection;
   options.styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
-  var layer = new OpenLayers.Layer.Vector(title, options);
 
   // GeoJSON Projection handling
   var geojson_options = {
@@ -22,6 +21,7 @@ Drupal.openlayers.layer.geojson = function(title, map, options) {
 
   // If GeoJSON data is provided with the layer, use that
   if (options.geojson_data) {
+    var layer = new OpenLayers.Layer.Vector(title, options);
     // Read data in.
     features = new OpenLayers.Format.GeoJSON(geojson_options).read(options.geojson_data);
     if (features) {
@@ -35,34 +35,17 @@ Drupal.openlayers.layer.geojson = function(title, map, options) {
     if (features) {
       layer.addFeatures(features);
     }
+    return layer;
   }
   else {
-    // Use an AJAX like call to get data from URL
-    OpenLayers.loadURL(options.url, {}, null, function (response) {
-      var format = new OpenLayers.Format.GeoJSON(geojson_options);
-      var features = format.read(response.responseText);
-      // Add features, if needed
-      if (features) {
-        layer.addFeatures(features);
-      }
-    });
-    
-    // Extend options with a Fixed strategy fo getting from URL.
-    //
-    // This seems a bit more natural but does not
-    // seem to work.
-    /*
-    options = $.extend(options, {
-      strategies: [ new OpenLayers.Strategy.Fixed() ],
+    return new OpenLayers.Layer.Vector(title, $.extend(options, {
+      strategies: [new OpenLayers.Strategy.Fixed()],
       protocol: new OpenLayers.Protocol.HTTP({
         url: options.url,
         format: new OpenLayers.Format.GeoJSON()
       })
-    });
-    */
+    }));
   }
-
-  return layer;
 };
 
 })(jQuery);