CASSANDRA-5800 follow-up

patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-5800