Bug#925496: Fix available upstream

[Mike Crowe]

Control: tags -1 + fixed-upstream

The workaround is included in upstream v4.19.35 onwards:
b787544dc5e707fec86161b881391eb9342806e6.

Mike.