Follow-up to CASSANDRA-5052