--- old/modules/controls/src/main/java/javafx/scene/control/Tooltip.java	2016-06-03 11:04:05.817423568 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Tooltip.java	2016-06-03 11:04:05.677423569 -0700
@@ -28,6 +28,7 @@
 
 import com.sun.javafx.beans.IDProperty;
 import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.stage.PopupWindowHelper;
 
 import javafx.css.SimpleStyleableBooleanProperty;
@@ -268,7 +269,7 @@
         private boolean fontSetByCss = false;
 
         @Override public void applyStyle(StyleOrigin newOrigin, Font value) {
-            // RT-20727 - if CSS is setting the font, then make sure invalidate doesn't call impl_reapplyCSS
+            // RT-20727 - if CSS is setting the font, then make sure invalidate doesn't call NodeHelper.reapplyCSS
             try {
                 // super.applyStyle calls set which might throw if value is bound.
                 // Have to make sure fontSetByCss is reset.
@@ -294,7 +295,7 @@
             // css might need to be reapplied since font size affects
             // calculated values for styles with relative values
             if(fontSetByCss == false) {
-                Tooltip.this.bridge.impl_reapplyCSS();
+                NodeHelper.reapplyCSS(Tooltip.this.bridge);
             }
         }