RFR (XS): 8232771: Revert JDK-8230794 because of environment changes

[Thomas Schatzl]

Hi all,

   can I have reviews for this small change that reverts JDK-8230794 
because it let the failure reported in JDK-8227695 disappear? Also there 
were some environment changes that we think fixes the issue in JDK-8227695.

I would like the original code bake again, and see if this hunch is correct.
Later I still want to improve the assert, but first let's see about 
JDK-8227695. So sorry for the back and forth.

This is a straight revert of JDK-8230794 that applied without issues.

CR:
https://bugs.openjdk.java.net/browse/JDK-8232771
Webrev:
http://cr.openjdk.java.net/~tschatzl/8232771/webrev/
Testing:
local compilation

Thanks,
   Thomas