Reinstate Java 7 compatibility