Partially revert commit 36aa3f4d

Change-Id: Ia554d3e64da2ee620c69bc66b33a6cd305502c64
Reviewed-on: https://gerrit.libreoffice.org/67418
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit a7da5945)
Reviewed-on: https://gerrit.libreoffice.org/67422Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>