Scope fix for restart_command (part 2).