diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index 2edb8e70c8..1991b740c8 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -383,11 +383,7 @@ namespace OpenSim.world
             {
                 if (changes)
                 {
-                    lock (this.LockPhysicsEngine)
-                    {
-                        this.phyScene.SetTerrain(this.Terrain.getHeights1D());
-                    }
-                    this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                    /* Dont save here, rely on tainting system instead */
 
                     foreach (ClientView client in m_clientThreads.Values)
                     {