conditionally revert 96840ff0ce697c5c05b59d53409b3cf27ac35e5f

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