HIVE-7289: revert HIVE-6469 (Jayesh via Xuefu)

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