r217 with patches, re-compiled for Java 5