Also provide workarounds for some broadcasters which ignore this standard.
(cherry picked from commit 6217711a)