Here's an updated version of the patch: