Revert "Simpler watcher"

This reverts commit 45ab3baa4e5bde2eaa015d39c841e074a0a2fd48.