Comment 3 for bug 1620253

This is a tentative, symptomatic, patch to fix the problem against inksacpe trunk. There may be other problematic places that I didn't fix yet and it's possible that an automated test is in order.

I hereby disclaim any implicit or explicit ownership of my changes and place them under your choice of CC-zero/public domain/X11L/GPLv2+/any other approved open source licence.