Follow-up for 6327

patch by krummas; reviewed by slebresne for CASSANDRA-6327