Revert CASSANDRA-5838