am 18b5f44c: (-s ours) am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"

* commit '18b5f44c5eca22791c701d02bf7525c6bfd5aec3':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"