Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java	(revision 18119)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java	(revision 18120)
@@ -11,5 +11,4 @@
 import java.util.Locale;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -779,5 +778,5 @@
         if (position != null) {
             wpt = new WayPoint(position);
-            wpt.setInstant(Optional.ofNullable(exifGpsTime).orElse(exifTime));
+            wpt.setInstant(exifTime);
             Double ele = getElevation();
             if (ele != null) {