Switch back to copying; too much breakage moving things around