Revert f8bf37d and try a cleaner fix.
OpenCL Office formats: get_key() bugfix, affecting UTF-8 mode.
Merge branch 'unstable-jumbo' into bleeding-jumbo

* unstable-jumbo:
  OpenCL Office formats: get_key() bugfix, affecting UTF-8 mode.
  Revert f8bf37d and try a cleaner fix.