diff --git a/ChangeLog b/ChangeLog
index bfeaf49854..7c373f80a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-21  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): revert last change.
+
 Mon May 21 13:58:32 2007  Tim Janik  <timj@imendio.com>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check.
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 6d3af0ea01..93e6b924cf 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4807,7 +4807,7 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
                          GtkTreeModel *model)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_TREE_MODEL (model));
+  g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
 
   if (model == combo_box->priv->model)
     return;