This change was previously blocked because of JDK-8031625 which has now been fixed.