Reverted commit d61f08bfbef6749aa51fa215409ada56fdccd211: changes to adapt https://issues.apache.org/jira/browse/HADOOP-9357 that have been rolled back.