backport CASSANDRA-6011