Gentler version for CASSANDRA-5172