diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index 36c2ca0..1aacd74 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -519,10 +519,8 @@
     if (config.HasClientRequestedIndependentOption(kROWR, perspective_)) {
       retransmittable_on_wire_behavior_ = SEND_RANDOM_BYTES;
     }
-  }
 
-  // Set retransmittable-on-wire timeout to different PTO based values.
-  if (perspective_ == Perspective::IS_CLIENT && version().IsIetfQuic()) {
+    // Set retransmittable-on-wire timeout to different PTO based values.
     if (config.HasClientRequestedIndependentOption(kROW1, perspective_)) {
       ping_manager_.set_num_ptos_for_retransmittable_on_wire_timeout(1);
     }
diff --git a/quiche/quic/core/quic_framer.cc b/quiche/quic/core/quic_framer.cc
index 3acdbe3..42c6a87 100644
--- a/quiche/quic/core/quic_framer.cc
+++ b/quiche/quic/core/quic_framer.cc
@@ -1641,26 +1641,18 @@
     return true;
   }
 
+  QUICHE_DCHECK(!version_.IsIetfQuic());
   QuicConnectionId original_destination_connection_id;
-  if (version_.IsIetfQuic()) {
-    // Parse Original Destination Connection ID.
-    if (!reader->ReadLengthPrefixedConnectionId(
-            &original_destination_connection_id)) {
-      set_detailed_error("Unable to read Original Destination ConnectionId.");
-      return false;
-    }
-  } else {
-    // Parse Original Destination Connection ID Length.
-    uint8_t odcil = header.type_byte & 0xf;
-    if (odcil != 0) {
-      odcil += kConnectionIdLengthAdjustment;
-    }
+  // Parse Original Destination Connection ID Length.
+  uint8_t odcil = header.type_byte & 0xf;
+  if (odcil != 0) {
+    odcil += kConnectionIdLengthAdjustment;
+  }
 
-    // Parse Original Destination Connection ID.
-    if (!reader->ReadConnectionId(&original_destination_connection_id, odcil)) {
-      set_detailed_error("Unable to read Original Destination ConnectionId.");
-      return false;
-    }
+  // Parse Original Destination Connection ID.
+  if (!reader->ReadConnectionId(&original_destination_connection_id, odcil)) {
+    set_detailed_error("Unable to read Original Destination ConnectionId.");
+    return false;
   }
 
   if (!QuicUtils::IsConnectionIdValidForVersion(
diff --git a/quiche/quic/core/quic_session.cc b/quiche/quic/core/quic_session.cc
index 4ff5df5..a8f8e79 100644
--- a/quiche/quic/core/quic_session.cc
+++ b/quiche/quic/core/quic_session.cc
@@ -1963,9 +1963,7 @@
     // Server sends HANDSHAKE_DONE to signal confirmation of the handshake
     // to the client.
     control_frame_manager_.WriteOrBufferHandshakeDone();
-    if (connection()->version().IsIetfQuic()) {
-      MaybeSendAddressToken();
-    }
+    MaybeSendAddressToken();
   }
 }