Reinstate Java 6 compatibility