Can you just update this PR and remove the patch? Thanks!