Fix CASSANDRA-6714 leftover issue