Really restore Java 6 compatibilty