backported the fix for JDK-7195187
2 files changed