Index: res_features.c
===================================================================
--- res_features.c	(revision 36289)
+++ res_features.c	(working copy)
@@ -145,7 +145,6 @@
 	int priority;
 	int parkingtime;
 	int notquiteyet;
-	char peername[1024];
 	unsigned char moh_trys;
 	struct parkeduser *next;
 };
@@ -327,8 +326,6 @@
 		pu->parkingtime = parkingtime;
 	if (extout)
 		*extout = x;
-	if (peer) 
-		ast_copy_string(pu->peername, peer->name, sizeof(pu->peername));
 
 	/* Remember what had been dialed, so that if the parking
 	   expires, we try to come back to the same place */
@@ -1486,8 +1483,6 @@
 	struct timeval tv;
 	struct ast_frame *f;
 	char exten[AST_MAX_EXTENSION];
-	char *peername,*cp;
-	char returnexten[AST_MAX_EXTENSION];
 	struct ast_context *con;
 	int x;
 	fd_set rfds, efds;
@@ -1516,34 +1511,11 @@
 				ast_moh_stop(pu->chan);
 				ast_indicate(pu->chan, AST_CONTROL_UNHOLD);
 				/* Get chan, exten from derived kludge */
-				if (pu->peername[0]) {
-					peername = ast_strdupa(pu->peername);
-					cp = strrchr(peername, '-');
-					if (cp) 
-						*cp = 0;
-					con = ast_context_find(parking_con_dial);
-					if (!con) {
-						con = ast_context_create(NULL, parking_con_dial, registrar);
-						if (!con) {
-							ast_log(LOG_ERROR, "Parking dial context '%s' does not exist and unable to create\n", parking_con_dial);
-						}
-					}
-					if (con) {
-						snprintf(returnexten, sizeof(returnexten), "%s||t", peername);
-						ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", strdup(returnexten), FREE, registrar);
-					}
-					ast_copy_string(pu->chan->exten, peername, sizeof(pu->chan->exten));
-					ast_copy_string(pu->chan->context, parking_con_dial, sizeof(pu->chan->context));
-					pu->chan->priority = 1;
+				/* They've been waiting too long, send them back to where they came.  Theoretically they  should have their original extensions and such, but we copy to be on the safe side */
+				ast_copy_string(pu->chan->exten, pu->exten, sizeof(pu->chan->exten));
+				ast_copy_string(pu->chan->context, pu->context, sizeof(pu->chan->context));
+				pu->chan->priority = pu->priority;
 
-				} else {
-					/* They've been waiting too long, send them back to where they came.  Theoretically they
-					   should have their original extensions and such, but we copy to be on the safe side */
-					ast_copy_string(pu->chan->exten, pu->exten, sizeof(pu->chan->exten));
-					ast_copy_string(pu->chan->context, pu->context, sizeof(pu->chan->context));
-					pu->chan->priority = pu->priority;
-				}
-
 				manager_event(EVENT_FLAG_CALL, "ParkedCallTimeOut",
 					"Exten: %d\r\n"
 					"Channel: %s\r\n"