CASSANDRA-6742 follow up