Index: channels/chan_iax2.c
===================================================================
--- channels/chan_iax2.c	(revision 220456)
+++ channels/chan_iax2.c	(working copy)
@@ -5379,7 +5379,6 @@
 	if (ies->called_number)
 		ast_string_field_set(iaxs[callno], exten, ies->called_number);
 	if (ies->calling_number) {
-		ast_shrink_phone_number(ies->calling_number);
 		ast_string_field_set(iaxs[callno], cid_num, ies->calling_number);
 	}
 	if (ies->calling_name)
Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 220456)
+++ channels/chan_sip.c	(working copy)
@@ -9877,8 +9877,6 @@
 			<sip:8164444422;phone-context=+1@1.2.3.4:5060;user=phone;tag=SDadkoa01-gK0c3bdb43>
 		*/
 		tmp = strsep(&tmp, ";");
-		if (ast_is_shrinkable_phonenumber(tmp))
-			ast_shrink_phone_number(tmp);
 		ast_string_field_set(p, cid_num, tmp);
 	}
 
@@ -9906,13 +9904,9 @@
 		}
 		/* replace callerid if rpid found, and not restricted */
 		if (!ast_strlen_zero(rpid_num) && ast_test_flag(&p->flags[0], SIP_TRUSTRPID)) {
-			char *tmp;
 			if (*calleridname)
 				ast_string_field_set(p, cid_name, calleridname);
-			tmp = ast_strdupa(rpid_num);
-			if (ast_is_shrinkable_phonenumber(tmp))
-				ast_shrink_phone_number(tmp);
-			ast_string_field_set(p, cid_num, tmp);
+			ast_string_field_set(p, cid_num, rpid_num);
 		}
 		
 		do_setnat(p, ast_test_flag(&p->flags[0], SIP_NAT_ROUTE) );
@@ -9932,10 +9926,7 @@
 			if (!ast_strlen_zero(user->context))
 				ast_string_field_set(p, context, user->context);
 			if (!ast_strlen_zero(user->cid_num)) {
-				char *tmp = ast_strdupa(user->cid_num);
-				if (ast_is_shrinkable_phonenumber(tmp))
-					ast_shrink_phone_number(tmp);
-				ast_string_field_set(p, cid_num, tmp);
+				ast_string_field_set(p, cid_num, user->cid_num);
 			}
 			if (!ast_strlen_zero(user->cid_name))
 				ast_string_field_set(p, cid_name, user->cid_name);
@@ -10017,12 +10008,9 @@
 
 			/* replace callerid if rpid found, and not restricted */
 			if (!ast_strlen_zero(rpid_num) && ast_test_flag(&p->flags[0], SIP_TRUSTRPID)) {
-				char *tmp = ast_strdupa(rpid_num);
 				if (*calleridname)
 					ast_string_field_set(p, cid_name, calleridname);
-				if (ast_is_shrinkable_phonenumber(tmp))
-					ast_shrink_phone_number(tmp);
-				ast_string_field_set(p, cid_num, tmp);
+				ast_string_field_set(p, cid_num, rpid_num);
 			}
 			do_setnat(p, ast_test_flag(&p->flags[0], SIP_NAT_ROUTE));
 
@@ -10069,10 +10057,7 @@
 					ast_string_field_set(p, authname, peer->username);
 				}
 				if (!ast_strlen_zero(peer->cid_num)) {
-					char *tmp = ast_strdupa(peer->cid_num);
-					if (ast_is_shrinkable_phonenumber(tmp))
-						ast_shrink_phone_number(tmp);
-					ast_string_field_set(p, cid_num, tmp);
+					ast_string_field_set(p, cid_num, peer->cid_num);
 				}
 				if (!ast_strlen_zero(peer->cid_name)) 
 					ast_string_field_set(p, cid_name, peer->cid_name);
@@ -10117,12 +10102,9 @@
 				else
 					res = AUTH_SECRET_FAILED; /* we don't want any guests, authentication will fail */
 			} else if (!ast_strlen_zero(rpid_num) && ast_test_flag(&p->flags[0], SIP_TRUSTRPID)) {
-				char *tmp = ast_strdupa(rpid_num);
 				if (*calleridname)
 					ast_string_field_set(p, cid_name, calleridname);
-				if (ast_is_shrinkable_phonenumber(tmp))
-					ast_shrink_phone_number(tmp);
-				ast_string_field_set(p, cid_num, tmp);
+				ast_string_field_set(p, cid_num, rpid_num);
                         }
 		}