Revert CASSANDRA-6132 (pushing to 2.0 only)