Is this just a problem for upgrades? If so, maybe it would be sufficient to just make the commands above part of the upgrade process.
Is this just a problem for upgrades? If so, maybe it would be sufficient to just make the commands above part of the upgrade process.