diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index acf841df78bede685680e262e0c88448a66ed9d6..7ad0a007fce7dd88004752764bdb409c73ea3d0c 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,9 @@
+2000-01-20  Andy Hertzfeld <andy@eazel.com>
+
+	* libnautilus/gnome-icon-container.c:
+	disabled the pernicious call to relayout in size_allocate.  We will want to do automatic layout
+	when the window size changes, but this is the wrong level for it, it happens too frequently
+	
 2000-01-20  Elliot Lee  <sopwith@redhat.com>
 
 	* src/ntl-window-msgs.c:
diff --git a/libnautilus-extensions/gnome-icon-container.c b/libnautilus-extensions/gnome-icon-container.c
index 5b2f44edd1bc3b475cc3437c1f120d1de7e505e8..4db5a163e628f7ce3dcf66613637e630d8a4e65d 100644
--- a/libnautilus-extensions/gnome-icon-container.c
+++ b/libnautilus-extensions/gnome-icon-container.c
@@ -1837,16 +1837,18 @@ size_allocate (GtkWidget *widget,
 	if (visible_width == 0)
 		visible_width = 1;
 
-#if 1
+
+#if 0
 	grid->visible_width = visible_width;
 	grid->height = MAX(visible_height, grid->height);
 	gnome_icon_container_relayout(container);
 #else
+	/*
 	if (visible_width > grid->width || visible_height > grid->height)
 		icon_grid_resize (grid,
 				  MAX (visible_width, grid->width),
 				  MAX (visible_height, grid->height));
-
+	*/
 	/* icon_grid_resize(grid, visible_width, visible_height); */
 	/*	icon_grid_set_visible_width (grid, visible_width); */
 #endif
diff --git a/libnautilus-private/gnome-icon-container.c b/libnautilus-private/gnome-icon-container.c
index 5b2f44edd1bc3b475cc3437c1f120d1de7e505e8..4db5a163e628f7ce3dcf66613637e630d8a4e65d 100644
--- a/libnautilus-private/gnome-icon-container.c
+++ b/libnautilus-private/gnome-icon-container.c
@@ -1837,16 +1837,18 @@ size_allocate (GtkWidget *widget,
 	if (visible_width == 0)
 		visible_width = 1;
 
-#if 1
+
+#if 0
 	grid->visible_width = visible_width;
 	grid->height = MAX(visible_height, grid->height);
 	gnome_icon_container_relayout(container);
 #else
+	/*
 	if (visible_width > grid->width || visible_height > grid->height)
 		icon_grid_resize (grid,
 				  MAX (visible_width, grid->width),
 				  MAX (visible_height, grid->height));
-
+	*/
 	/* icon_grid_resize(grid, visible_width, visible_height); */
 	/*	icon_grid_set_visible_width (grid, visible_width); */
 #endif
diff --git a/libnautilus/gnome-icon-container.c b/libnautilus/gnome-icon-container.c
index 5b2f44edd1bc3b475cc3437c1f120d1de7e505e8..4db5a163e628f7ce3dcf66613637e630d8a4e65d 100644
--- a/libnautilus/gnome-icon-container.c
+++ b/libnautilus/gnome-icon-container.c
@@ -1837,16 +1837,18 @@ size_allocate (GtkWidget *widget,
 	if (visible_width == 0)
 		visible_width = 1;
 
-#if 1
+
+#if 0
 	grid->visible_width = visible_width;
 	grid->height = MAX(visible_height, grid->height);
 	gnome_icon_container_relayout(container);
 #else
+	/*
 	if (visible_width > grid->width || visible_height > grid->height)
 		icon_grid_resize (grid,
 				  MAX (visible_width, grid->width),
 				  MAX (visible_height, grid->height));
-
+	*/
 	/* icon_grid_resize(grid, visible_width, visible_height); */
 	/*	icon_grid_set_visible_width (grid, visible_width); */
 #endif