RFR(S): JDK-8131694 backout the fix for JDK-8131331 when JDK-8131693 is fixed

[Dmitry Samersoff]

Everybody,

Please review:

http://cr.openjdk.java.net/~dsamersoff/JDK-8131694/webrev.01/

-Dmitry

-- 
Dmitry Samersoff
Oracle Java development team, Saint Petersburg, Russia
* I would love to change the world, but they won't give me the sources.