diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 9d10f53bedb5b39fddfd5c85e35222c0aaf9aad6..07fcd9970124662d46c0377c21508aac4d530fb3 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -435,6 +435,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
     //    return;
     //}
 
+#if 0 // AXON MAINT-8554 - this may be overly restrictive for large models
     LLVector3 constrained_pos = LLVector3(llclamp(pos[0],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
                                           llclamp(pos[1],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
                                           llclamp(pos[2],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET));
@@ -443,6 +444,9 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
         LL_DEBUGS("Avatar") << mesh_id << " joint " << getName() << " attachment pos override constrained to " 
                             << constrained_pos << " was " << pos << LL_ENDL;
     }
+#else
+    LLVector3 constrained_pos = pos;
+#endif
     
     LLVector3 before_pos;
     LLUUID before_mesh_id;