Remove Java-7 dependency, take #2