Applied the patch in #5. It worked cleanly. Please see the screenshot.