almost back to libevent change over