HIVE-8442 Revert HIVE-8403 (Alan Gates)

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