(bug 31719) Revert r107359 and apply a proper solution for entity expansion in SVGs.