Workaround etcd Watch timeout bug

Uck!   This only happens with watch right?