In master shell, calling destroy does this automatically, but the patch was not backported, so we need to hack around this here.
In master shell, calling destroy does this automatically, but the patch was not backported, so we need to hack around this here.