Ensure that the library remains compliant with Java 6 [java source level reverted at commit 811590d8]