HIVE-7123: Follow-up of HIVE-6367 (reviewed by Brock)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1598450 13f79535-47bb-0310-9956-ffa450edef68