Reverting to be Java 6 compatible