Issue #8165 by tj, removed watchdog