Changes reverted for Cassandra 1.x compatibility