restore wrong (but performant) possible_watcher impl
Merge pull request #1883 from opf/hotfix/watcher_list_performance

restore wrong (but performant) possible_watcher impl
Merge branch 'release/3.0' into dev