Restart/cleanup is currently optional and off by default though. If we're going to rely on it more we should make it the default.