8232771: Revert JDK-8230794 because of environment changes

Reviewed-by: pliden, sjohanss
1 file changed