Not sure why this got removed, but re-adding fixes the thread watcher