Fix up convenience copy for fewer copies.
Revert "Fix up convenience copy for fewer copies."

This reverts commit ad7d21d0e9cab8ee8fe25340258c27bef39e7f9e.