Switch to fs-watcher