Workaround etcd Watch timeout bug