Attempt to manually merge back in tcp async work