diff --git a/ChangeLog b/ChangeLog
index 34b566cee4..e6711291ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-25  Wim Taymans  <wim@fluendo.com>
+
+	* gst/gstpad.c: (gst_pad_set_active), (gst_pad_link_prepare),
+	(gst_pad_link), (gst_pad_accept_caps), (gst_pad_query),
+	(gst_pad_send_event), (gst_pad_start_task):
+	Disable attempt at mode switching until it is figured out.
+
 2005-05-25  Wim Taymans  <wim@fluendo.com>
 
 	* gst/base/gstadapter.c: (gst_adapter_peek), (gst_adapter_flush):
diff --git a/gst/gstpad.c b/gst/gstpad.c
index b8d4cbb52e..f553f5b366 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -442,7 +442,7 @@ gst_pad_set_active (GstPad * pad, GstActivateMode mode)
   GstRealPad *realpad;
   GstActivateMode old;
   GstPadActivateFunction activatefunc;
-  gboolean active;
+  gboolean active, oldactive;
 
   g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
 
@@ -450,10 +450,17 @@ gst_pad_set_active (GstPad * pad, GstActivateMode mode)
 
   active = GST_PAD_MODE_ACTIVATE (mode);
   old = GST_RPAD_ACTIVATE_MODE (realpad);
+  oldactive = GST_PAD_MODE_ACTIVATE (old);
 
   /* if nothing changed, we can just exit */
+  if (G_UNLIKELY (oldactive == active))
+    goto was_ok;
+
+  /* FIXME, no mode switching yet, need more design docs first */
+#if 0
   if (G_UNLIKELY (old == mode))
     goto was_ok;
+#endif
 
   /* make sure data is disallowed when going inactive */
   if (!active) {