diff --git a/libraries/networking/src/udt/ControlPacket.cpp b/libraries/networking/src/udt/ControlPacket.cpp
index 626e126c03..b64e471428 100644
--- a/libraries/networking/src/udt/ControlPacket.cpp
+++ b/libraries/networking/src/udt/ControlPacket.cpp
@@ -42,32 +42,11 @@ std::unique_ptr<ControlPacket> ControlPacket::fromReceivedPacket(std::unique_ptr
 }
 
 std::unique_ptr<ControlPacket> ControlPacket::create(Type type, qint64 size) {
-    
-    std::unique_ptr<ControlPacket> controlPacket;
-    
-    if (size == -1) {
-        return std::unique_ptr<ControlPacket>(new ControlPacket(type));
-    } else {
-        // Fail with invalid size
-        Q_ASSERT(size >= 0);
-        
-        return std::unique_ptr<ControlPacket>(new ControlPacket(type, size));
-    }
-}
-
-ControlPacket::ControlPacket(Type type) :
-    BasePacket(-1),
-    _type(type)
-{
-    adjustPayloadStartAndCapacity(ControlPacket::localHeaderSize());
-    
-    open(QIODevice::ReadWrite);
-    
-    writeType();
+    return std::unique_ptr<ControlPacket>(new ControlPacket(type, size));
 }
 
 ControlPacket::ControlPacket(Type type, qint64 size) :
-    BasePacket(ControlPacket::localHeaderSize() + size),
+    BasePacket((size == -1) ? -1 : ControlPacket::localHeaderSize() + size),
     _type(type)
 {
     adjustPayloadStartAndCapacity(ControlPacket::localHeaderSize());
diff --git a/libraries/networking/src/udt/ControlPacket.h b/libraries/networking/src/udt/ControlPacket.h
index c4ad7065a7..e0e3e38796 100644
--- a/libraries/networking/src/udt/ControlPacket.h
+++ b/libraries/networking/src/udt/ControlPacket.h
@@ -47,8 +47,7 @@ public:
     void setType(Type type);
     
 private:
-    ControlPacket(Type type);
-    ControlPacket(Type type, qint64 size);
+    ControlPacket(Type type, qint64 size = -1);
     ControlPacket(std::unique_ptr<char> data, qint64 size, const HifiSockAddr& senderSockAddr);
     ControlPacket(ControlPacket&& other);
     ControlPacket(const ControlPacket& other) = delete;