Revert HDFS-2922 via svn merge -c -1242572 The patch broke a lot of unit tests in the nightly build. Will recommit after it is fixed.