Integrated: 8250843: [Lanai] Back out changes done in JDK-8250778

[Ajit Ghaisas]

Issue : https://bugs.openjdk.java.net/browse/JDK-8250843

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

Commit messages:
 - revert JDK-8250778 changes

Changes: https://git.openjdk.java.net/lanai/pull/71/files
 Webrev: https://webrevs.openjdk.java.net/lanai/71/webrev.00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8250843
  Stats: 116 lines in 2 files changed: 1 ins; 93 del; 22 mod
  Patch: https://git.openjdk.java.net/lanai/pull/71.diff
  Fetch: git fetch https://git.openjdk.java.net/lanai pull/71/head:pull/71

PR: https://git.openjdk.java.net/lanai/pull/71