Please review this simple backport. The patch applies cleanly with only hunk offsets adjustments. JIRA: https://bugs.openjdk.java.net/browse/JDK-8252754 Webrev: http://cr.openjdk.java.net/~jbachorik/8252754/11u/webrev/ Cheers, -JB-