The restart schedule was left in there, as it might turn out to be
needed soon. We don't do the restarts after a timeout, but right away
now (should change soon).

The brittle mode is gone for now.

Unit tests not updated yet, but system tests pass.