Here's another fix I discovered porting work to upstream today.

Cheers,

Zach