gistfile1.txt

diff --git a/src/avro/internode.genavro b/src/avro/internode.genavro
index 4ab75dc..1e7d43b 100644
--- a/src/avro/internode.genavro
+++ b/src/avro/internode.genavro
@@ -61,7 +61,7 @@ protocol InterNode {
         union { null, double} memtable_operations_in_millions = null;
         union { int, null } id;
         union { array<ColumnDef>, null } column_metadata;
-        union { boolean, null } replicate_on_write;
+        union { null, boolean } replicate_on_write = null;
     }
 
     @aliases(["org.apache.cassandra.config.avro.KsDef"])
diff --git a/src/java/org/apache/cassandra/io/SerDeUtils.java b/src/java/org/apache/cassandra/io/SerDeUtils.java
index 5066c5a..937ed90 100644
--- a/src/java/org/apache/cassandra/io/SerDeUtils.java
+++ b/src/java/org/apache/cassandra/io/SerDeUtils.java
@@ -64,8 +64,7 @@ public final class SerDeUtils
     {
         BinaryDecoder dec = DIRECT_DECODERS.createBinaryDecoder(ByteBufferUtil.getArray(bytes), null);
         SpecificDatumReader<T> reader = new SpecificDatumReader<T>(writer);
-        // we're expecting to see the schema of the writer, not the current schema, aka ob.getSchema().
-        reader.setExpected(writer);
+        reader.setExpected(ob.getSchema());
         return reader.read(ob, dec);
     }