--- old/modules/graphics/src/main/java/javafx/scene/layout/BorderConverter.java	2015-09-03 15:10:34.660295100 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/BorderConverter.java	2015-09-03 15:10:34.037259400 -0700
@@ -25,7 +25,6 @@
 
 package javafx.scene.layout;
 
-import com.sun.javafx.css.StyleConverterImpl;
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.scene.layout.region.BorderImageSlices;
 import com.sun.javafx.scene.layout.region.Margins;
@@ -34,6 +33,7 @@
 import javafx.css.CssMetaData;
 import javafx.css.ParsedValue;
 import javafx.css.Styleable;
+import javafx.css.StyleConverter;
 import javafx.geometry.Insets;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
@@ -41,7 +41,7 @@
 
 /**
  */
-class BorderConverter extends StyleConverterImpl<ParsedValue[], Border> {
+class BorderConverter extends StyleConverter<ParsedValue[], Border> {
 
     private static final BorderConverter BORDER_IMAGE_CONVERTER =
             new BorderConverter();