#271 Restored Java 6 compatibility.