8008744: Rework part of fix for JDK-6741606

Reviewed-by: xuelei, ahgross
4 files changed