svn merge -r 1458380:1458376 Reverted MAPREDUCE-5028 from branch-0.23


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