revert HIVE-6827 to fix unit test failure

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