@Gargron Seems to me like special-casing it for Youtube would be the cleaner option. It's only them misbehaving, and hopefully it will eventually be fixed and the special case can be removed again.