diff --git a/platform/platform-api/src/com/intellij/ui/ScreenUtil.java b/platform/platform-api/src/com/intellij/ui/ScreenUtil.java
index 8f46df3054c3..00300b390604 100644
--- a/platform/platform-api/src/com/intellij/ui/ScreenUtil.java
+++ b/platform/platform-api/src/com/intellij/ui/ScreenUtil.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.ui;
 
+import com.intellij.Patches;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.containers.WeakHashMap;
@@ -164,6 +165,10 @@ public class ScreenUtil {
   }
 
   private static Insets calcInsets(GraphicsConfiguration gc) {
+    if (Patches.SUN_BUG_ID_9000030 && GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices().length > 1) {
+      return new Insets(0, 0, 0, 0);
+    }
+
     return Toolkit.getDefaultToolkit().getScreenInsets(gc);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index ffaee05ef2f6..d8c1f084d494 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -105,7 +105,6 @@ public class StartupUtil {
     loadSystemLibraries(log);
 
     if (!Main.isHeadless()) {
-      AppUIUtil.patchSystem();
       AppUIUtil.updateWindowIcon(JOptionPane.getRootFrame());
       AppUIUtil.registerBundledFonts();
     }
diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
index ce65d0e6d973..a9eefcb35c9f 100644
--- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.ui;
 
-import com.intellij.Patches;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
@@ -26,7 +25,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.util.PlatformUtils;
@@ -49,21 +47,6 @@ import java.util.List;
 public class AppUIUtil {
   private static final String VENDOR_PREFIX = "jetbrains-";
 
-  public static void patchSystem() {
-    if (Patches.SUN_BUG_ID_9000030 && Registry.is("ide.x11.suppress.xinerama")) {
-      GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-      if (ge.getScreenDevices().length > 1) {
-        try {
-          @SuppressWarnings("SpellCheckingInspection") Field xinerState = ge.getClass().getDeclaredField("xinerState");
-          xinerState.setAccessible(true);
-          xinerState.set(null, Boolean.FALSE);
-          Logger.getInstance(AppUIUtil.class).info("Xinerama detection suppressed");
-        }
-        catch (Exception ignored) { }
-      }
-    }
-  }
-
   public static void updateWindowIcon(@NotNull Window window) {
     window.setIconImages(getAppIconImages());
   }
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 0676fe268fa5..6fb8b82651fe 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -65,7 +65,6 @@ idea.fix.mac.env=true
 idea.fix.mac.env.description=On Mac, use shell environment for external processes (effective on restart).
 
 ide.x11.override.wm=true
-ide.x11.suppress.xinerama=true
 
 ide.appIcon.progress=true
 ide.appIcon.badge=true