Hi Guix,

I realized my last patch was based on previous work.

I cherry-picked this one onto master.

Thanks,

John