Re-patch issue #12 with a better fix

12 jobs for repatch_12 in 1 minute and 49 seconds (queued for 11 seconds)