--- old/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java	2020-02-18 23:07:07.000000000 -0800
+++ new/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java	2020-02-18 23:07:07.000000000 -0800
@@ -60,7 +60,6 @@
 import java.awt.PopupMenu;
 import java.awt.PrintJob;
 import java.awt.RenderingHints;
-import java.awt.Robot;
 import java.awt.ScrollPane;
 import java.awt.Scrollbar;
 import java.awt.SystemTray;
@@ -553,11 +552,11 @@
     }
 
     @Override
-    public RobotPeer createRobot(Robot target, GraphicsDevice screen) {
-        // (target is unused for now)
-        // Robot's don't need to go in the peer map since
-        // they're not Component's
-        return new WRobotPeer(screen);
+    public RobotPeer createRobot(GraphicsDevice screen) throws AWTException {
+        if (screen instanceof Win32GraphicsDevice) {
+            return new WRobotPeer();
+        }
+        return super.createRobot(screen);
     }
 
     public WEmbeddedFramePeer createEmbeddedFrame(WEmbeddedFrame target) {