Reverting HIVE-7283 because of unit test failures. (Gunther Hagleitner)

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