Adding a TODO to put back in the autorestart