Revert "Adding CASSANDRA-6244 to our patched build"

This reverts commit c5bf7564ac7d8e8da1851c78c8f0ae778906e702.