PMC-18296 - Get working with Java 1.6