Issue #2170353 by jonathan1055, pfrenssen, Sutharsan: Reduce memory footprint.