Post-CASSANDRA-6945 tweak