and account for the libreofficekit changes This reverts commit 50e9065cbbb2c62fa925cf5b561a85c715a0eb1e. that did in turn revert 4ae8c3c20bd4a10ba141a32f01e23ac63636f9c3. Change-Id: Ie02d8743b3608120ed63bfe2a014fa4139577b01