Removing Java 7 dependency.