RFR: 8138917: Back out of failing change set for 8130681.

[Max Ockner]

Hello all,
Please review this back out of a recent change for bug 8130681.

Bug: https://bugs.openjdk.java.net/browse/JDK-8138917
Webrev:  http://cr.openjdk.java.net/~mockner/8138917/

Summary: The previous fix was incomplete and introduced a new failure in
the kitchensink tests. This bug is an integration blocker. The current
fix simply backs out the faulty changes for 8130681. There will be a
more extensive fix in the near future.

Tested using jtreg for runtime/NMT/

Thanks,
Max