Maintain compatibility with Java 6...again