Post-CASSANDRA-7058 fix