Revert risky parts of "trimmed a bunch of copy()s"

This reverts risky parts of commit 47df2c6355ec2093ef4cd1c8400d484584a676d5.