Comment 2 for bug 1842167

Upstream posted a patch, which I have included here.

As far as I can tell, this should fix the issue with this particular station. I don't know why it hasn't been applied upstream, but I see no reason why we can't apply it while we wait for upstream.