This reverts commit 2f132439. This actually solved the issue (Collabora Online worked!) but this is not a long-term solution, just a test.
