Revert "Fix bug in Magic when destructor called too early"

This reverts commit 16972c2c6fda3573860f5f8b0f2c03b757e71d3c.