Revert "Java 8 workaround"

This reverts commit 3682a747bdf319a34fcce7cad9771a1a3ead34ec.
2 files changed