Revert initial HADOOP-9357 patch.


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