diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index cd09945f3f..7093121499 100644
--- a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
@@ -43,7 +43,9 @@ namespace OpenSim.Framework.Interfaces
         void RemovePrim(LLUUID primID);
         void LoadPrimitives(ILocalStorageReceiver receiver);
 
+        [System.Obsolete("Use DataStorage instead")]
         float[] LoadWorld();
+        [System.Obsolete("Use DataStorage instead")]
         void SaveMap(float[] heightmap);
 
         void SaveParcels(ParcelData[] parcels);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 839a75a48e..e370047f90 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -266,7 +266,8 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     this.phyScene.SetTerrain(Terrain.getHeights1D());
                 }
-                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                this.storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
 
                 m_clientManager.ForEachClient(delegate(IClientAPI client)
                                                   {
@@ -297,7 +298,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     this.phyScene.SetTerrain(this.Terrain.getHeights1D());
                 }
-                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                this.storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD());
 
                 m_clientManager.ForEachClient(delegate(IClientAPI client)
                                                   {