revert #7275
Merge branch 'cassandra-1.2' into cassandra-2.0
merge from 2.0