am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert...
am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
* commit '0109c7a329da4a478d212d58e131d8dc7ff16498':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""