CASSANDRA-6876 follow-up