Followup for CASSANDRA-7403