Revert to pre-shutdown code