diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 2411ee23ac..a7878667bc 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -41,7 +41,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityAdd:
         case PacketType::EntityEdit:
         case PacketType::EntityData:
-            return VERSION_ENTITIES_POLYLINE_TEXTURE;
+            return VERSION_ENTITIES_ACTIONS_PER_HAND_OFFSET;
         case PacketType::AvatarData:
         case PacketType::BulkAvatarData:
         default:
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index d1a8e20dcd..5610d31661 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -159,7 +159,7 @@ const PacketVersion VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP = 46;
 const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP = 47;
 const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP_BIS = 48;
 const PacketVersion VERSION_ENTITIES_PARTICLES_ADDITIVE_BLENDING = 49;
-const PacketVersion VERSION_ENTITIES_ACTIONS_PER_HAND_OFFSET = 50;
-const PacketVersion VERSION_ENTITIES_POLYLINE_TEXTURE = 51;
+const PacketVersion VERSION_ENTITIES_POLYLINE_TEXTURE = 50;
+const PacketVersion VERSION_ENTITIES_ACTIONS_PER_HAND_OFFSET = 51;
 
 #endif // hifi_PacketHeaders_h
diff --git a/libraries/physics/src/ObjectMotionState.cpp b/libraries/physics/src/ObjectMotionState.cpp
index aa9f7852c8..1199c3792a 100644
--- a/libraries/physics/src/ObjectMotionState.cpp
+++ b/libraries/physics/src/ObjectMotionState.cpp
@@ -135,11 +135,7 @@ void ObjectMotionState::updateCCDConfiguration() {
             btVector3 center;
             btScalar radius;
             _shape->getBoundingSphere(center, radius);
-            _body->setCcdMotionThreshold(radius * RADIUS_MOTION_THRESHOLD_MULTIPLIER);
-
-            // TODO: Ideally the swept sphere radius would be contained by the object. Using the bounding sphere
-            // radius works well for spherical objects, but may cause issues with other shapes. For arbitrary
-            // objects we may want to consider a different approach, such as grouping rigid bodies together.
+            _body->setCcdMotionThreshold(radius / 4.0f);
             _body->setCcdSweptSphereRadius(radius);
         } else {
             // Disable CCD