Pulling in the fix for https://issues.apache.org/jira/browse/CASSANDRA-5106