This reverts commit 5acadbfb.

Conflicts:
	libreofficekit/qa/lokconf_init/lokconf_init.cxx

Change-Id: I88221f660bcf15cbc29e90bfc3016b367570f9af