applied https://issues.apache.org/jira/secure/attachment/12616787/cassandra-1.2-6436.txt