--- old/modules/graphics/src/main/java/javafx/scene/shape/Circle.java	2016-06-03 11:04:31.265423282 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/shape/Circle.java	2016-06-03 11:04:31.077423284 -0700
@@ -72,6 +72,12 @@
             }
 
             @Override
+            public BaseBounds doComputeGeomBounds(Node node,
+            BaseBounds bounds, BaseTransform tx) {
+                return ((Circle) node).doComputeGeomBounds(bounds, tx);
+            }
+
+            @Override
             public com.sun.javafx.geom.Shape doConfigShape(Shape shape) {
                 return ((Circle) shape).doConfigShape();
             }
@@ -161,7 +167,7 @@
                 @Override
                 public void invalidated() {
                     NodeHelper.markDirty(Circle.this, DirtyBits.NODE_GEOMETRY);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(Circle.this);
                 }
 
                 @Override
@@ -204,7 +210,7 @@
                 @Override
                 public void invalidated() {
                     NodeHelper.markDirty(Circle.this, DirtyBits.NODE_GEOMETRY);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(Circle.this);
                 }
 
                 @Override
@@ -231,7 +237,7 @@
         @Override
         public void invalidated() {
             NodeHelper.markDirty(Circle.this, DirtyBits.NODE_GEOMETRY);
-            impl_geomChanged();
+            NodeHelper.geomChanged(Circle.this);
         }
 
         @Override
@@ -284,12 +290,10 @@
         return new NGCircle();
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+    /*
+     * Note: This method MUST only be called via its accessor method.
      */
-    @Deprecated
-    @Override public BaseBounds impl_computeGeomBounds(BaseBounds bounds, BaseTransform tx) {
+    private BaseBounds doComputeGeomBounds(BaseBounds bounds, BaseTransform tx) {
         // if there is no fill or stroke, then there are no bounds. The bounds
         // must be marked empty in this case to distinguish it from 0,0,0,0
         // which would actually contribute to the bounds of a group.