Tweak for Cassandra 2.0