Revert "Watch: Fix bad etcd indexing"

This reverts commit e78e51a6ae0892f1658c63a43f96864fd910157a.