This reverts its original implementation introduced with
93e6291c partially, and
improves the patch proposed at 746633bd
(but reverted at e265ea36).

Change-Id: If0aa5b985cac45a1cd9ea87bae293243af9d12b2
Reviewed-on: https://gerrit.libreoffice.org/29271Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>