Looks liek this was fixed upstream, by commit 2d5046d31f4f5c961fc4aa6b415a00bb9eadae2b. I'll cherrypick the fix.
Looks liek this was fixed upstream, by commit 2d5046d31f4f5c9 61fc4aa6b415a00 bb9eadae2b. I'll cherrypick the fix.