Revert HADOOP-11356 in branch-2.