--- old/modules/graphics/src/main/java/javafx/scene/input/Dragboard.java	2016-04-29 10:55:10.674151200 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/input/Dragboard.java	2016-04-29 10:55:10.309742300 -0700
@@ -70,21 +70,11 @@
         return peer.getTransferModes();
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
-     */
-    @Deprecated
-    public TKClipboard impl_getPeer() {
+    private TKClipboard getPeer() {
         return peer;
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
-     */
-    @Deprecated
-    public static Dragboard impl_createDragboard(TKClipboard peer) {
+    private static Dragboard createDragboard(TKClipboard peer) {
         return new Dragboard(peer);
     }
 
@@ -181,8 +171,22 @@
     static {
         // This is used by classes in different packages to get access to
         // private and package private methods.
-        DragboardHelper.setDragboardAccessor((dragboard, restricted) -> {
-            dragboard.dataAccessRestricted = restricted;
+        DragboardHelper.setDragboardAccessor(new DragboardHelper.DragboardAccessor() {
+
+            @Override
+            public void setDataAccessRestriction(Dragboard dragboard, boolean restricted) {
+                dragboard.dataAccessRestricted = restricted;
+            }
+
+            @Override
+            public TKClipboard getPeer(Dragboard dragboard) {
+                return dragboard.getPeer();
+            }
+
+            @Override
+            public Dragboard createDragboard(TKClipboard peer) {
+                return Dragboard.createDragboard(peer);
+            }
         });
     }
 }