diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 2115e9c..9fb8cc5 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1198,33 +1198,6 @@ on_randr_event (GnomeRRScreen *screen, gpointer data)
                  * outputs in a sane way.
                  */
 
-
-#if 1
-                if (config_timestamp != priv->last_config_timestamp) {
-                        priv->last_config_timestamp = config_timestamp;
-                        auto_configure_outputs (manager, config_timestamp);
-                }
-#else
-                /* WHY THIS CODE IS DISABLED:
-                 *
-                 * The strategy of "on hotplug or unsuspend, restore a
-                 * known-good configuration, and fall back to autoconfiguration"
-                 * works fine as long as you don't happen to be running
-                 * gnome-display-properties and click its "Detect displays"
-                 * button.
-                 *
-                 * If you do that, the RANDR calls from g-d-p will cause the X
-                 * server to re-probe the RANDR outputs.  The server will send
-                 * us an event, we'll restore the configuration to something
-                 * else... and you'll be weirded out, because "just detecting
-                 * your monitors" should not change the current configuration,
-                 * right?
-                 *
-                 * We may need some kind of D-bus API so that g-d-p can inhibit
-                 * this RANDR plugin's reconfiguration-fu when the "Detect
-                 * displays" button is being used.
-                 */
-
                 char *intended_filename;
                 GError *error;
                 gboolean success;
@@ -1256,9 +1229,11 @@ on_randr_event (GnomeRRScreen *screen, gpointer data)
                         if (error)
                                 g_error_free (error);
 
-                        auto_configure_outputs (manager, config_timestamp);
+                        if (config_timestamp != priv->last_config_timestamp) {
+                                priv->last_config_timestamp = config_timestamp;
+                                auto_configure_outputs (manager, config_timestamp);
+                        }
                 }
-#endif
         }
 
         refresh_tray_icon_menu_if_active (manager, MAX (change_timestamp, config_timestamp));
