Remove use of Objects.requireNonNull (not in openjdk6)