r471: Fixed shutdown crash, added Revert