This reverts commit 4f20c9f6

Change-Id: I4d8cef801d570b0c20e580144e79a5940b100271
Reviewed-on: https://gerrit.libreoffice.org/5476Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>