This workaround, which is both complex and quite incomplete,
should no longer be necessary because the fixes for tdf#103567
should also fix i#124143, see unit test in previous commit.

Change-Id: I038f238d5e3cf5cadfc666196380b7b351543982