diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 072286b9ab..06b7e299b9 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -437,43 +437,35 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
 std::unique_ptr<NLPacket> LimitedNodeList::constructPingPacket(PingType_t pingType) {
     int packetSize = sizeof(PingType_t) + sizeof(quint64);
     auto pingPacket = NLPacket::create(PacketType::Ping, packetSize);
+    pingPacket->writePrimitive(pingType);
+    pingPacket->writePrimitive(usecTimestampNow());
 
-    QDataStream packetStream(pingPacket.get());
-
-    packetStream << pingType;
-    packetStream << usecTimestampNow();
-
-    return pingPacket;
+    return std::move(pingPacket);
 }
 
 std::unique_ptr<NLPacket> LimitedNodeList::constructPingReplyPacket(NLPacket& pingPacket) {
-    QDataStream pingPacketStream(&pingPacket);
-
     PingType_t typeFromOriginalPing;
-    pingPacketStream >> typeFromOriginalPing;
-
     quint64 timeFromOriginalPing;
-    pingPacketStream >> timeFromOriginalPing;
+    pingPacket.readPrimitive(&typeFromOriginalPing);
+    pingPacket.readPrimitive(&timeFromOriginalPing);
 
     int packetSize = sizeof(PingType_t) + sizeof(quint64) + sizeof(quint64);
-
     auto replyPacket = NLPacket::create(PacketType::PingReply, packetSize);
+    replyPacket->writePrimitive(typeFromOriginalPing);
+    replyPacket->writePrimitive(timeFromOriginalPing);
+    replyPacket->writePrimitive(usecTimestampNow());
 
-    QDataStream packetStream(replyPacket.get());
-    packetStream << typeFromOriginalPing << timeFromOriginalPing << usecTimestampNow();
-
-    return replyPacket;
+    return std::move(replyPacket);
 }
 
 std::unique_ptr<NLPacket> LimitedNodeList::constructICEPingPacket(PingType_t pingType, const QUuid& iceID) {
     int packetSize = NUM_BYTES_RFC4122_UUID + sizeof(PingType_t);
 
     auto icePingPacket = NLPacket::create(PacketType::ICEPing, packetSize);
-
     icePingPacket->write(iceID.toRfc4122());
     icePingPacket->writePrimitive(pingType);
 
-    return icePingPacket;
+    return std::move(icePingPacket);
 }
 
 std::unique_ptr<NLPacket> LimitedNodeList::constructICEPingReplyPacket(NLPacket& pingPacket, const QUuid& iceID) {
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 76148935f1..5a10ade654 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -125,12 +125,11 @@ qint64 NodeList::sendStatsToDomainServer(const QJsonObject& statsObject) {
 }
 
 void NodeList::timePingReply(QSharedPointer<NLPacket> packet, const SharedNodePointer& sendingNode) {
-    QDataStream packetStream(packet.data());
-
-    quint8 pingType;
+    PingType_t pingType;
     quint64 ourOriginalTime, othersReplyTime;
-
-    packetStream >> pingType >> ourOriginalTime >> othersReplyTime;
+    packet->readPrimitive(&pingType);
+    packet->readPrimitive(&ourOriginalTime);
+    packet->readPrimitive(&othersReplyTime);
 
     quint64 now = usecTimestampNow();
     int pingTime = now - ourOriginalTime;