--- asterisk/channels/chan_mgcp.c.ORIG	Tue Feb 22 13:18:18 2005
+++ asterisk/channels/chan_mgcp.c	Sun Apr  3 22:57:45 2005
@@ -2436,6 +2436,7 @@
 	int timeout = firstdigittimeout;
 	int res;
 	int getforward=0;
+	p->hidecallerid = 0;  /* Default to not hiding until *67 used */
     while(len < AST_MAX_EXTENSION-1) {
         res = ast_waitfordigit(chan, timeout);
         timeout = 0;
@@ -2624,21 +2625,6 @@
                 memset(exten, 0, sizeof(exten));
                 len = 0;
             }
-        } else if (p->hidecallerid && !strcmp(exten, "*82")) {
-            if (option_verbose > 2) {
-                ast_verbose(VERBOSE_PREFIX_3 "Enabling Caller*ID on %s\n", chan->name);
-            }
-            /* Enable Caller*ID if enabled */
-            p->hidecallerid = 0;
-            if (chan->callerid)
-                free(chan->callerid);
-            if (strlen(p->callerid))
-                chan->callerid = strdup(p->callerid);
-            /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/
-            transmit_notify_request(sub, "L/sl");
-            len = 0;
-            memset(exten, 0, sizeof(exten));
-            timeout = firstdigittimeout;
         } else if (!ast_canmatch_extension(chan, chan->context, exten, 1, chan->callerid) &&
                         ((exten[0] != '*') || (strlen(exten) > 2))) {
             if (option_debug)