This is a "redo" of JDK-8218057, which was backed out in JDK-8218084. The underlying issue has been resolved so we can now put this change in again. The patch is the same as last time. Bug: https://bugs.openjdk.java.net/browse/JDK-8218135 Webrev: http://cr.openjdk.java.net/~erikj/8218135/webrev.01/