diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 17603b6a19..9c929a7891 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1533,6 +1533,7 @@ namespace OpenSim.Region.Framework.Scenes
 */
         public int GetStateSource()
         {
+/*
             AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID);
 
             if (aCircuit != null && (aCircuit.teleportFlags != (uint)TeleportFlags.Default))
@@ -1543,6 +1544,8 @@ namespace OpenSim.Region.Framework.Scenes
                 return 5; // StateSource.Teleporting
             }
             return 2; // StateSource.PrimCrossing
+*/
+            return m_teleportFlags == TeleportFlags.Default ? 2 : 5;
         }
 
         /// <summary>