Fix incomplete deletion of delivered hints patch by jbellis; reviewed by brandonwilliams for CASSANDRA-3466