Revert "Copy tweaks."

This reverts commit c79c0c4a7d2f6656208519313990542fc076c4a3.