Seems to cause tinderbox build breakage, sigh.

This reverts commit 1c1b788f.

Change-Id: I5a69e186e0f8f71c2fcc81d27bebe2253fd240bb
Reviewed-on: https://gerrit.libreoffice.org/21699Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>