fix our local libuv changes to work with current libuv