Patch is implemented in upstream