Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 2483)
+++ channels/chan_sip.c	(working copy)
@@ -1171,24 +1171,7 @@
 /*! \brief  sip_is_nat_needed: Check if we need NAT or STUN */
 static inline int sip_is_nat_needed(struct sip_pvt *p) 
 {
-    int ret=0;
-    int globalnat_set;
-
-    globalnat_set=(opbx_test_flag(&global_flags, SIP_NAT) & SIP_NAT_ALWAYS)==SIP_NAT_ALWAYS;
-
-    // If nat=route, then id stun is needed, apply nat to RTP
-    if        (  (opbx_test_flag(p, SIP_NAT) & SIP_NAT_ROUTE  ) && p->stun_needed )
-    {
-        ret=1;
-    }
-    // If nat=yes AND global nat is not set as yes/always
-    else if ( (  opbx_test_flag(p, SIP_NAT) & SIP_NAT_ALWAYS ) && !globalnat_set )
-    {
-        ret=1;
-    }
-    //opbx_log(LOG_WARNING,"is_nat_needed ret: %d *** globalnat_set: %d \n",globalnat_set);
-
-    return ret;
+    return ((opbx_test_flag(&global_flags, SIP_NAT) & SIP_NAT_ALWAYS)==SIP_NAT_ALWAYS);
 }