taking out code from Dave Brosius's patch (5201_a.txt) to CASSANDRA-5201