Partial revert of da40cac540e7d735edbe9069b3c8ec6af4530208

As requested from Michael Stahl here:
https://gerrit.libreoffice.org/#/c/12164/

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