This reverts commit d6ce95ae.

Not necessary to fix fdo#87044, commit
1e10f6d2 is sufficient. Since the code
that is reintroduced leads to an overly complex and fragile document
structure, I'd rather not have it.