Workaround etcd Watch timeout bug

cool! :)