--- old/modules/javafx.controls/src/main/java/javafx/scene/control/skin/AccordionSkin.java	2016-09-27 21:00:17.000000000 -0700
+++ new/modules/javafx.controls/src/main/java/javafx/scene/control/skin/AccordionSkin.java	2016-09-27 21:00:16.000000000 -0700
@@ -221,7 +221,7 @@
         for (TitledPane tp : getSkinnable().getPanes()) {
             if (!tp.equals(expandedPane)) {
                 TitledPaneSkin childSkin = (TitledPaneSkin) ((TitledPane)tp).getSkin();
-                collapsedPanesHeight += snapSize(childSkin.getTitleRegionSize(w));
+                collapsedPanesHeight += snapSizeY(childSkin.getTitleRegionSize(w));
             }
         }
         final double maxTitledPaneHeight = h - collapsedPanesHeight;
@@ -231,7 +231,7 @@
             double ph;
             if (skin instanceof TitledPaneSkin) {
                 ((TitledPaneSkin)skin).setMaxTitledPaneHeightForAccordion(maxTitledPaneHeight);
-                ph = snapSize(((TitledPaneSkin)skin).getTitledPaneHeightForAccordion());
+                ph = snapSizeY(((TitledPaneSkin)skin).getTitledPaneHeightForAccordion());
             } else {
                 ph = tp.prefHeight(w);
             }