Revert CASSANDRA-12768 (and update fix of CASSANDRA-12694) due to upgrade regression

patch by Sylvain Lebresne; reviewed by Benjamin Lerer for CASSANDRA-13025
6 files changed