Revert "Make watcher api better for public usage."

This reverts commit 160e66351bf68076070ad253b7e70c3af7ff6cd5.