diff --git a/ChangeLog b/ChangeLog
index 26153107f4..1e7a89e7ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-28  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimplevelstool.c: reverted fix for bug #141930. These
+	hacks are there because the enum used in levels doesn't match
+	the enum used by the combo box and the histogram widget.
+
 2004-06-28  Michael Natterer  <mitch@gimp.org>
 
 	* app/tools/gimpclonetool.c (gimp_clone_tool_button_release):
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index bf659227bf..105750a830 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -308,6 +308,9 @@ gimp_levels_tool_initialize (GimpTool    *tool,
   gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (l_tool->channel_menu),
                                  l_tool->channel);
 
+  if (! l_tool->color && l_tool->alpha)
+    l_tool->channel = 1;
+
   levels_update (l_tool, ALL);
 
   gimp_drawable_calculate_histogram (drawable, l_tool->hist);
@@ -907,6 +910,10 @@ levels_channel_callback (GtkWidget      *widget,
   gimp_histogram_view_set_channel (GIMP_HISTOGRAM_VIEW (tool->hist_view),
                                    tool->channel);
 
+  /* FIXME: hack */
+  if (! tool->color && tool->alpha)
+    tool->channel = (tool->channel > 1) ? 2 : 1;
+
   levels_update (tool, ALL);
 }