Don't us fs.watch. Cherry pick and squash 2b8e4a29752