*Merge.

--HG--
branch : trunk

1 files changed, 1 insertions, 11 deletions

diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index ddc04d382de..d14b213d9fa 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -53,17 +53,7 @@ void DynamicObject::AddToWorld()
 void DynamicObject::RemoveFromWorld()
 {
     ///- Remove the dynamicObject from the accessor
-    if(IsInWorld())
-    {
-        // Make sure the object is back to grid container for removal as farsight targets
-        // are switched to world container on creation and they are also set to active
-        if (isActive())
-        {
-            GetMap()->SwitchGridContainers(this, false);
-            setActive(false);
-        }
-        ObjectAccessor::Instance().RemoveObject(this);
-    }
+    if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
     WorldObject::RemoveFromWorld();
 }