Hacked around Java 8 requirement.