This reverts commit 111db5b9.

Change-Id: I1138592ab54865f4c2ac4599fab572c5666bf723
Reviewed-on: https://gerrit.libreoffice.org/46864Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>