Revert "Add some extra checks for file watchers" This reverts commit 00719712d06cd2ea5f06166a561c640476dd3409.