keep magic wrappers from causing themselves to be torn down during reset
Merge pull request #1437 from evs-chris/gh-1342

Keep magic wrappers from causing themselves to be torn down during reset