Patch does not apply to net-next-0