I have created https://issues.apache.org/jira/browse/HIVE-6456. I will get that committed and then port the commit over here.