diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 0656975657a2bafa6bf6c5536638929ddb3843be..bde3a04a3a99f3e63574fd634821631aa0604034 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -2,11 +2,11 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: builtin_functions.c,v 1.532 2004/03/02 20:45:47 nilsson Exp $
+|| $Id: builtin_functions.c,v 1.533 2004/03/07 02:05:24 nilsson Exp $
 */
 
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.532 2004/03/02 20:45:47 nilsson Exp $");
+RCSID("$Id: builtin_functions.c,v 1.533 2004/03/07 02:05:24 nilsson Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
@@ -6891,54 +6891,6 @@ PMOD_EXPORT void f__dump_backlog(INT32 args)
 
 #endif
 
-/*! @decl array map_array(array arr, function fun, mixed ... args)
- *! @decl array map_array(array(object) arr, string fun, mixed ... args)
- *! @decl array map_array(array(function) arr, int(-1..-1) minus_one, @
- *!                       mixed ... args)
- *!
- *!   This function is similar to @[map()].
- *!
- *! @note
- *!   This function has been deprecated in favour of @[map()].
- *!
- *! @seealso
- *!   @[map()]
- */
-PMOD_EXPORT void f_map_array(INT32 args)
-{
-  ONERROR tmp;
-  INT32 e;
-  struct svalue *fun;
-  struct array *ret,*foo;
-  TYPE_FIELD types;
-
-  if (args < 2)
-    SIMPLE_TOO_FEW_ARGS_ERROR("map_array", 2);
-
-  if(Pike_sp[-args].type != T_ARRAY)
-    SIMPLE_BAD_ARG_ERROR("map_array", 1, "array");
-  
-  foo=Pike_sp[-args].u.array;
-  fun=Pike_sp-args+1;
-
-  ret=allocate_array(foo->size);
-  types = 0;
-  SET_ONERROR(tmp, do_free_array, ret);
-  for(e=0;e<foo->size;e++)
-  {
-    push_svalue(ITEM(foo)+e);
-    assign_svalues_no_free(Pike_sp,fun+1,args-2,-1);
-    Pike_sp+=args-2;
-    apply_svalue(fun,args-1);
-    stack_pop_to_no_free (ITEM(ret) + e);
-    types |= 1 << ITEM(ret)[e].type;
-  }
-  ret->type_field = types;
-  pop_n_elems(args);
-  UNSET_ONERROR(tmp);
-  push_array(ret);
-}
-
 /*! @decl mixed map(mixed arr, void|mixed fun, mixed ... extra)
  *!
  *!   Applies @[fun] to the elements in @[arr] and collects the results.
@@ -7586,7 +7538,7 @@ PMOD_EXPORT void f_filter(INT32 args)
    }
 }
 
-/* map(), map_array() and filter() inherit sideeffects from their
+/* map() and filter() inherit sideeffects from their
  * second argument.
  */
 static node *fix_map_node_info(node *n)
@@ -7604,7 +7556,7 @@ static node *fix_map_node_info(node *n)
 	(cb->u.sval.type == T_FUNCTION) &&
 	(cb->u.sval.subtype == FUNCTION_BUILTIN)) {
       if (cb->u.sval.u.efun->optimize == fix_map_node_info) {
-	/* map(), map_array() or filter(). */
+	/* map() or filter(). */
 	continue;
       }
       node_info &= cb->u.sval.u.efun->flags;
diff --git a/src/builtin_functions.h b/src/builtin_functions.h
index 8ed9d4c5f35ebb825bddeba7e35c40c835d4a066..a445fc1abf68e6fac270b0dbccb6d31411a40c1c 100644
--- a/src/builtin_functions.h
+++ b/src/builtin_functions.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: builtin_functions.h,v 1.29 2003/11/14 11:00:44 mast Exp $
+|| $Id: builtin_functions.h,v 1.30 2004/03/07 02:19:09 nilsson Exp $
 */
 
 #ifndef BUILTIN_EFUNS_H
@@ -121,7 +121,6 @@ PMOD_EXPORT void f__locate_references(INT32 args);
 PMOD_EXPORT void f__describe(INT32 args);
 PMOD_EXPORT void f__gc_set_watch(INT32 args);
 PMOD_EXPORT void f__dump_backlog(INT32 args);
-PMOD_EXPORT void f_map_array(INT32 args);
 PMOD_EXPORT void f_map(INT32 args);
 PMOD_EXPORT void f_filter(INT32 args);
 PMOD_EXPORT void f_inherit_list(INT32 args);