CASSANDRA-7144 follow-up