Workaround etcd Watch timeout bug

Next PR will make it clear.

Although refactoring this method+goroutine entirely is probably a better option than either control flow statement.