removed post-1.1.13 watcher-related additions