Comment by gorgonical

Mind sharing the fix as a patch? I would like to run it this way, too.