Comment 14 for bug 1896438

I used the -next version of g-s-s with the commit from #12 applied and also applied a workaround by @vern from #4. The workaround worked for me.

This hack is a bit risky in production environments so I'm attaching field-high, as we are seeing this issue on multiple deployments.