Fix regression from CASSANDRA-6855