diff --git a/CHANGES b/CHANGES
index c655f0a..16f7f33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -104,6 +104,9 @@
 
   BUG FIXES
 
+    TAJO-858: Support for hadoop kerberos authentication in Tajo.
+    (Min Zhou via jinho)
+
     TAJO-2066: Fix TestJoinOnPartitionedTables.testPartialFilterPushDown failure.
     (jinho)
 
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileScanner.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileScanner.java
index 33f1d04..94e07e5 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileScanner.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileScanner.java
@@ -102,20 +102,7 @@
   }
 
   public static FileSystem getFileSystem(TajoConf tajoConf, Path path) throws IOException {
-    String tajoUser = tajoConf.getVar(TajoConf.ConfVars.USERNAME);
-    FileSystem fs;
-    if(tajoUser != null) {
-      try {
-        fs = FileSystem.get(path.toUri(), tajoConf, tajoUser);
-      } catch (InterruptedException e) {
-        LOG.warn("Occur InterruptedException while FileSystem initiating with user[" + tajoUser + "]");
-        fs = FileSystem.get(path.toUri(), tajoConf);
-      }
-    } else {
-      fs = FileSystem.get(path.toUri(), tajoConf);
-    }
-
-    return fs;
+    return FileSystem.get(path.toUri(), tajoConf);
   }
 
   @Override