Fix #1699, we really haven't needed this check since adding the tree watcher