reverted to original for forking and Cassandra 2.0