This reverts commit 69632c9c.

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