revert CASSANDRA-5523
Merge branch 'cassandra-1.2' into trunk
remove unused serializedSize field