Update patch to match new upstream