Revert HIVE-8582: Causes build failures (Gunther Hagleitner)

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