Apply community patch for https://issues.apache.org/jira/browse/HIVE-4619

This wasn't fixed in hive-0.11.0, it breaks our ONO desktops.