revert #5966
merge from 1.2
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0