Revert HIVE-6757(r1585758) going back to r1585754, didn't rm files

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