This reverts commit 11f8e53d.

At the time this commit was imported from AOO, we had the
original problem fixed already with
dd8fa7c2 ("fix more lifecycle
problems").

Change-Id: Id8288d30c1cb908b68e5b9ef0279237412aae357