Upgrade to work with Cassandra1.1.12