Reviewed-by: lancea, darcy
Backout changeset for JDK-8176354 Reviewed-by: asmotrak
Reviewed-by: xuelei