Here’s a new patch incorporating the changes: