It has been some time since the last activity on this bug report, and the broken SVG display can be annoying for uses that need it, e.g. telega users.

@Alan: Is there any particular reason for not merging your patch to the master?