RFR: 8283899: Revert 8284190 after fix of 8281297

[Leo Korinth]

8283899: Revert 8284190 after fix of 8281297

-------------

Depends on: https://git.openjdk.java.net/jdk/pull/8560

Commit messages:
 - 8283899: Revert 8284190 after fix of 8281297

Changes: https://git.openjdk.java.net/jdk/pull/8580/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=8580&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8283899
  Stats: 5 lines in 1 file changed: 0 ins; 5 del; 0 mod
  Patch: https://git.openjdk.java.net/jdk/pull/8580.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/8580/head:pull/8580

PR: https://git.openjdk.java.net/jdk/pull/8580