8181659: Create an alternative fix for JDK-8167102, whose fix was backed out

Reviewed-by: prr, serb
2 files changed