Revert "no need to save original" - this commit caused mem leaks

This reverts commit 172f0c305fc5f5de658098c7a348ef1ea7d7bf46.