Partially convert restart to use SchedulerUtils