Reverting r1615706 (HADOOP-10759) from branch-2.5.0

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5.0@1616028 13f79535-47bb-0310-9956-ffa450edef68