Remove dependency from Java 7