Revert "Working thread watcher fix"

This reverts commit acd139cf83996c13cbe5a3b475f08adbe41b1c20.