This partially reverts commit 827430c8

Change-Id: Ia5d609040a3b355659e780e0606ce4bff0d22509
Reviewed-on: https://gerrit.libreoffice.org/52572Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>