diff --git a/ChangeLog b/ChangeLog
index ed01f55832..7e5de468e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconv/gconv_open.c: Undo last two changes for now.  They break
+	everything.
+
 2000-07-12  Andreas Jaeger  <aj@suse.de>
 
 	* elf/Makefile (SYSCONF-FLAGS): Added to pass sysconfdir to
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 7a17b7005a..c54054a3e5 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -184,10 +184,14 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 
 	  /* Call all initialization functions for the transformation
 	     step implementations.  */
-	  for (cnt = 0; cnt < nsteps; ++cnt)
+	  for (cnt = 0; cnt < nsteps - 1; ++cnt)
 	    {
 	      size_t size;
 
+	      /* If this is the last step we must not allocate an
+		 output buffer.  */
+	      result->__data[cnt].__flags = conv_flags;
+
 	      /* Would have to be done if we would not clear the whole
                  array above.  */
 #if 0
@@ -201,6 +205,16 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 	      /* We use the `mbstate_t' member in DATA.  */
 	      result->__data[cnt].__statep = &result->__data[cnt].__state;
 
+	      /* Allocate the buffer.  */
+	      size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
+
+	      result->__data[cnt].__outbuf = (char *) malloc (size);
+	      if (result->__data[cnt].__outbuf == NULL)
+		goto bail;
+
+	      result->__data[cnt].__outbufend =
+		result->__data[cnt].__outbuf + size;
+
 	      /* Now see whether we can use any of the transliteration
 		 modules for this step.  */
 	      for (runp = trans; runp != NULL; runp = runp->next)
@@ -241,33 +255,57 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 			}
 		      break;
 		    }
+	    }
 
-	      result->__steps[cnt].__data = &result->__data[cnt];
+	  /* Now handle the last entry.  */
+	  result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST;
+	  /* Would have to be done if we would not clear the whole
+	     array above.  */
+#if 0
+	  result->__data[cnt].__invocation_counter = 0;
+	  result->__data[cnt].__internal_use = 0;
+#endif
+	  result->__data[cnt].__statep = &result->__data[cnt].__state;
 
-	      /* If this is the last step we must not allocate an
-		 output buffer.  */
-	      if (cnt < nsteps - 1)
+	  /* Now see whether we can use the transliteration module
+	     for this step.  */
+	  for (runp = trans; runp != NULL; runp = runp->next)
+	    for (n = 0; n < runp->ncsnames; ++n)
+	      if (__strcasecmp (steps[cnt].__from_name, runp->csnames[n]) == 0)
 		{
-		  result->__data[cnt].__flags = conv_flags;
+		  void *data = NULL;
 
-		  /* Allocate the buffer.  */
-		  size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
+		  /* Match!  Now try the initializer.  */
+		  if (runp->trans_init_fct == NULL
+		      || (runp->trans_init_fct (data, steps[cnt].__to_name)
+			  == __GCONV_OK))
+		    {
+		      /* Append at the end of the list.  */
+		      struct __gconv_trans_data *newp;
+		      struct __gconv_trans_data *endp;
+		      struct __gconv_trans_data *lastp;
 
-		  result->__data[cnt].__outbuf = (char *) malloc (size);
-		  if (result->__data[cnt].__outbuf == NULL)
-		    goto bail;
+		      newp = (struct __gconv_trans_data *)
+			malloc (sizeof (struct __gconv_trans_data));
+		      if (newp == NULL)
+			goto bail;
 
-		  result->__data[cnt].__outbufend =
-		    result->__data[cnt].__outbuf + size;
-		}
-	      else
-		{
-		  /* Handle the last entry.  */
-		  result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST;
+		      newp->__trans_fct = runp->trans_fct;
+		      newp->__trans_context_fct = runp->trans_context_fct;
+		      newp->__trans_end_fct = runp->trans_end_fct;
 
+		      lastp = NULL;
+		      for (endp = result->__data[cnt].__trans;
+			   endp != NULL; endp = endp->__next)
+			lastp = endp;
+
+		      if (lastp == NULL)
+			result->__data[cnt].__trans = newp;
+		      else
+			lastp->__next = newp;
+		    }
 		  break;
 		}
-	    }
 	}
 
       if (res != __GCONV_OK)