False alarm, I had mis-merged your (old) patch.
After applying your patch from today, everything works.

I won't have access to this computer in 24 hours.  Let me know if there
is anything else you'd like me to test before then! :)

Cheers!

-- 
Pierre Neidhardt
https://ambrevar.xyz/