diff --git a/repository/MessagePack-Squeak-Core.package/DateAndTime.extension/instance/setNanoSeconds..st b/repository/MessagePack-Squeak-Core.package/DateAndTime.extension/instance/setNanoSeconds..st
deleted file mode 100644
index dd6a193..0000000
--- a/repository/MessagePack-Squeak-Core.package/DateAndTime.extension/instance/setNanoSeconds..st
+++ /dev/null
@@ -1,3 +0,0 @@
-*MessagePack-Squeak-Core
-setNanoSeconds: nanoSeconds
-	nanos := nanoSeconds
\ No newline at end of file
diff --git a/repository/MessagePack-Squeak-Core.package/DateAndTime.extension/properties.json b/repository/MessagePack-Squeak-Core.package/DateAndTime.extension/properties.json
deleted file mode 100644
index 2237b11..0000000
--- a/repository/MessagePack-Squeak-Core.package/DateAndTime.extension/properties.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"name" : "DateAndTime"
-}
\ No newline at end of file
diff --git a/repository/MessagePack-Squeak-Core.package/MpSqPortableUtil.class/instance/timestampFromSeconds.nanos..st b/repository/MessagePack-Squeak-Core.package/MpSqPortableUtil.class/instance/timestampFromSeconds.nanos..st
index 270fc07..d0e6c7f 100644
--- a/repository/MessagePack-Squeak-Core.package/MpSqPortableUtil.class/instance/timestampFromSeconds.nanos..st
+++ b/repository/MessagePack-Squeak-Core.package/MpSqPortableUtil.class/instance/timestampFromSeconds.nanos..st
@@ -1,6 +1,6 @@
 actions
 timestampFromSeconds: seconds nanos: nanoSeconds
-	| ts |
-	ts := DateAndTime fromSeconds: seconds + 2177452800 offset: 0.
-	nanoSeconds > 0 ifTrue: [ ts setNanoSeconds: nanoSeconds].
+	| microseconds ts |
+	microseconds := (seconds * 1000000) + (nanoSeconds * 0.001).
+	ts := DateAndTime utcMicroseconds: microseconds offset: 0.
 	^ts
\ No newline at end of file