Do not re-wrap vanilla goals (Fixes #10743)

[electronicboy]

There is no need to rewrap vanilla goals when they're being reregistered, this breaks some expectations around behavior outside of general wasting of resources.