JAL-3130 trying to be Java 1.8 source compatible -- not sure if this is ultimately...