- remove AC_DEFINE_UNQUOTED fix causing test failures - revert upstream change causing weird build issues (with libreoffice for example)