--- old/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java	2015-11-06 02:13:00.678121035 -0500
+++ new/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java	2015-11-06 02:13:00.522043037 -0500
@@ -80,9 +80,7 @@
         pack();
 
         Dimension size = getSize();
-        // TODO: When 6356322 is fixed we should get screen bounds in
-        // this way: eframe.getGraphicsConfiguration().getBounds().
-        Dimension scrSize = Toolkit.getDefaultToolkit().getScreenSize();
+        Rectangle scrSize = getGraphicsConfiguration().getBounds();
 
         if (corner.x < scrSize.width/2 && corner.y < scrSize.height/2) { // 1st square
             setLocation(corner.x + indent, corner.y + indent);