--- old/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp	2019-05-09 13:45:15.000000000 -0700
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp	2019-05-09 13:45:15.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -23,17 +23,7 @@
  * questions.
  */
 
-#include "awt_Rectangle.h"
-#include "awt.h"
-
-/************************************************************************
- * AwtRectangle fields
- */
-
-jfieldID AwtRectangle::xID;
-jfieldID AwtRectangle::yID;
-jfieldID AwtRectangle::widthID;
-jfieldID AwtRectangle::heightID;
+#include "java_awt_Rectangle.h"
 
 /************************************************************************
  * AwtRectangle native methods
@@ -43,25 +33,6 @@
 
 JNIEXPORT void JNICALL
 Java_java_awt_Rectangle_initIDs(JNIEnv *env, jclass cls) {
-    TRY;
-
-    AwtRectangle::xID = env->GetFieldID(cls, "x", "I");
-    DASSERT(AwtRectangle::xID != NULL);
-    CHECK_NULL(AwtRectangle::xID);
-
-    AwtRectangle::yID = env->GetFieldID(cls, "y", "I");
-    DASSERT(AwtRectangle::yID != NULL);
-    CHECK_NULL(AwtRectangle::yID);
-
-    AwtRectangle::widthID = env->GetFieldID(cls, "width", "I");
-    DASSERT(AwtRectangle::widthID != NULL);
-    CHECK_NULL(AwtRectangle::widthID);
-
-    AwtRectangle::heightID = env->GetFieldID(cls, "height", "I");
-    DASSERT(AwtRectangle::heightID != NULL);
-    CHECK_NULL(AwtRectangle::heightID);
-
-    CATCH_BAD_ALLOC;
 }
 
 } /* extern "C" */