Revert "Revert patch from CASSANDRA-4860, it makes for a pretty sizeable read performance regression."

This reverts commit e2450bb545ded7d197be8516cf51ee9dbf267425.
Vijay's proposed fix (version 2) for CASSANDRA-4860