--- old/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	2015-11-26 05:34:24.610869400 -0800
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	2015-11-26 05:34:24.204588300 -0800
@@ -2355,13 +2355,8 @@
 {
     TRY;
 
-    int width = ::GetSystemMetrics(SM_CXSCREEN);
+    return ::GetSystemMetrics(SM_CXSCREEN);
 
-    Devices::InstanceAccess devices;
-    AwtWin32GraphicsDevice *device = devices->GetDevice(
-                        AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
-
-    return (device == NULL) ? width : device->ScaleDownX(width);
     CATCH_BAD_ALLOC_RET(0);
 }
 
@@ -2375,12 +2370,7 @@
 {
     TRY;
 
-    int height = ::GetSystemMetrics(SM_CYSCREEN);
-    Devices::InstanceAccess devices;
-    AwtWin32GraphicsDevice *device = devices->GetDevice(
-                        AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
-
-    return (device == NULL) ? height : device->ScaleDownY(height);
+    return ::GetSystemMetrics(SM_CYSCREEN);
 
     CATCH_BAD_ALLOC_RET(0);
 }
--- /dev/null	2015-11-26 05:34:27.000000000 -0800
+++ new/test/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java	2015-11-26 05:34:27.001681900 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  @test
+  @bug 8144074
+  @summary Crash while getting screen size during Toolkit initialisation
+  @run main/othervm GetScreenSizeTest
+*/
+
+public class GetScreenSizeTest {
+    public static void main(String[] args) {
+        java.awt.Toolkit.getDefaultToolkit().getScreenSize();
+    }
+}