This reverts commit ffd7f8fcfc.
Caused some problems, need to be broken down.
Change-Id: Iee816a266c32e7cebe623d36300c13d079e77c52
Reviewed-on: https://gerrit.libreoffice.org/34534
Reviewed-by: jan iversen <jani@libreoffice.org>
Tested-by: jan iversen <jani@libreoffice.org>
