revert to naive hesitation algorithm

slower, but more reliable and easier to explain
updates for etcd 0.2