This reverts commit 99dbaba7.

Let's land this again once Stephan's comments in 
   https://gerrit.libreoffice.org/#/c/54189/
have been addressed

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