diff --git a/apps/app_curl.c b/apps/app_curl.c
index 1ef205e687..0432854a58 100644
--- a/apps/app_curl.c
+++ b/apps/app_curl.c
@@ -125,7 +125,7 @@ static int acf_curl_exec(struct ast_channel *chan, char *cmd, char *info, char *
 		return -1;
 	}
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	AST_STANDARD_APP_ARGS(args, info);	
 	
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index 535f4cd2ba..be73a0d105 100644
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -187,7 +187,7 @@ int acf_vmcount_exec(struct ast_channel *chan, char *cmd, char *argsstr, char *b
 		AST_APP_ARG(folder);
 	);
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	buf[0] = '\0';
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index d9ca0d72d8..f9f06f3b4f 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3156,7 +3156,7 @@ static int queue_function_qac(struct ast_channel *chan, char *cmd, char *data, c
 		return -1;
 	}
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 	
 	AST_LIST_LOCK(&queues);
 
@@ -3199,7 +3199,7 @@ static int queue_function_queuememberlist(struct ast_channel *chan, char *cmd, c
 		return -1;
 	}
 	
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	AST_LIST_LOCK(&queues);
 
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index c34b7d7407..753fb8976f 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -233,7 +233,7 @@ static int acf_sort_exec(struct ast_channel *chan, char *cmd, char *data, char *
 	struct localuser *u;
 	int ret = -1;
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	switch (sort_internal(chan, data, buf, len)) {
 	case ERROR_NOARG:
@@ -258,7 +258,7 @@ static int acf_cut_exec(struct ast_channel *chan, char *cmd, char *data, char *b
 	int ret = -1;
 	struct localuser *u;
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	switch (cut_internal(chan, data, buf, len)) {
 	case ERROR_NOARG:
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 17c48ff8f6..1da13a4d4a 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -99,7 +99,7 @@ static int function_enum(struct ast_channel *chan, char *cmd, char *data,
 	}
 	*p = '\0';
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	res = ast_get_enum(chan, p, dest, sizeof(dest), tech, sizeof(tech), args.zone,
 			   args.options);
@@ -141,7 +141,7 @@ static int function_txtcidname(struct ast_channel *chan, char *cmd,
 
 	buf[0] = '\0';
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n");
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 6ec0f3c932..0629246bcd 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -53,7 +53,7 @@ static int acf_rand_exec(struct ast_channel *chan, char *cmd,
 			     AST_APP_ARG(max);
 	);
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index 0f8cd5036e..d9d01b2512 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -332,21 +332,6 @@ void ast_unregister_atexit(void (*func)(void));
 	ast_update_use_count(); \
 }
 
-#define LOCAL_USER_ACF_ADD(u) { \
- \
-	if (!(u=calloc(1,sizeof(*u)))) { \
-		ast_log(LOG_WARNING, "Out of memory\n"); \
-		return -1; \
-	} \
-	ast_mutex_lock(&localuser_lock); \
-	u->chan = chan; \
-	u->next = localusers; \
-	localusers = u; \
-	localusecnt++; \
-	ast_mutex_unlock(&localuser_lock); \
-	ast_update_use_count(); \
-}
-
 /*! 
  * \brief Remove a localuser.
  * \param u the user to add, should be of type struct localuser
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index e7667df52f..bce019a8e0 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -3847,7 +3847,7 @@ static int dundifunc_read(struct ast_channel *chan, char *cmd, char *num, char *
 	struct localuser *u;
 	struct dundi_result dr[MAX_RESULTS];
 
-	LOCAL_USER_ACF_ADD(u);
+	LOCAL_USER_ADD(u);
 
 	buf[0] = '\0';