--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/AbstractEventStream.java	Fri Aug 02 20:04:02 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/AbstractEventStream.java	Fri Aug 02 20:05:23 2019 +0200
@@ -332,7 +332,6 @@
     private void execute() {
         JVM.getJVM().exclude(Thread.currentThread());
         try {
-            updateStartNanos();
             process();
         } catch (IOException e) {
             if (!isClosed()) {
@@ -345,19 +344,6 @@
         }
     }
 
-    // User setting overrides default
-    private void updateStartNanos() {
-        if (configuration.getStartTime() != null) {
-            StreamConfiguration c = new StreamConfiguration(configuration);
-            try {
-                c.setStartNanos(c.getStartTime().toEpochMilli() * 1_000_000L);
-            } catch (ArithmeticException ae) {
-                c.setStartNanos(Long.MAX_VALUE);
-            }
-            updateConfiguration(c);
-        }
-    }
-
     private void logException(Exception e) {
         // FIXME: e.printStackTrace(); for debugging purposes,
         // remove before before integration
@@ -522,6 +508,9 @@
                 throw new IllegalStateException("Event stream can only be started once");
             }
             StreamConfiguration c = new StreamConfiguration(configuration);
+            if (c.getStartTime() != null) {
+                startNanos= c.getStartTime().toEpochMilli() * 1_000_000L;
+            }
             c.setStartNanos(startNanos);
             c.setStarted(true);
             updateConfiguration(c);