Reverted some WIP copy changes