This reverts commit b9c6f2de.

Change-Id: Ice33baa738c025de72ceb11cf6746e017fb27484
Reviewed-on: https://gerrit.libreoffice.org/46964Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>