diff --git a/logstash-core/src/main/java/org/logstash/Timestamp.java b/logstash-core/src/main/java/org/logstash/Timestamp.java
index 71c0e2570..00f2c7664 100644
--- a/logstash-core/src/main/java/org/logstash/Timestamp.java
+++ b/logstash-core/src/main/java/org/logstash/Timestamp.java
@@ -11,8 +11,9 @@ import org.logstash.ackedqueue.Queueable;
 
 import java.io.IOException;
 import java.util.Date;
+import org.logstash.json.TimestampSerializer;
 
-@JsonSerialize(using = org.logstash.json.TimestampSerializer.class)
+@JsonSerialize(using = TimestampSerializer.class)
 public class Timestamp implements Cloneable, Comparable, Queueable {
 
     // all methods setting the time object must set it in the UTC timezone
diff --git a/logstash-core/src/main/java/org/logstash/TimestampSerializer.java b/logstash-core/src/main/java/org/logstash/TimestampSerializer.java
deleted file mode 100644
index 3c854c3d8..000000000
--- a/logstash-core/src/main/java/org/logstash/TimestampSerializer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-
-public class TimestampSerializer extends JsonSerializer<Timestamp> {
-
-    @Override
-    public void serialize(Timestamp value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException
-    {
-        jgen.writeString(value.toIso8601());
-    }
-}