Remove misguided stack allocation optimisations

patch by Benedict; reviewed by Aleksey for CASSANDRA-7515
Merge branch 'cassandra-2.1' into trunk