Redo async accept backport to not modify any public headers.