Hi Guix,

I realized my previous patch was based on previous work.

This one is cherry-picked onto master.

Thanks,

John