diff --git a/CHANGES.txt b/CHANGES.txt
index dfe5ae92f35..fee37553cc8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -192,6 +192,8 @@ Release 0.91.0 - Unreleased
    HBASE-4171  HBase shell broken in trunk (Lars Hofhansl)
    HBASE-4162  Fix TestHRegionInfo.testGetSetOfHTD: delete /tmp/hbase-<username>
                if it already exists (Mikhail Bautin)
+   HBASE-4179  Failed to run RowCounter on top of Hadoop branch-0.22
+               (Michael Weng)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java b/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java
index dcc40b178e6..d38956c46df 100644
--- a/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java
+++ b/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java
@@ -35,6 +35,7 @@ public class Driver {
     ProgramDriver pgd = new ProgramDriver();
     pgd.addClass(RowCounter.NAME, RowCounter.class,
       "Count rows in HBase table");
-    pgd.driver(args);
+    ProgramDriver.class.getMethod("driver", new Class [] {String[].class}).
+      invoke(pgd, new Object[]{args});
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java b/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
index e44406867bd..dda4241698a 100644
--- a/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
+++ b/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
@@ -48,6 +48,7 @@ public class Driver {
         " the data from tables in two different clusters. WARNING: It" +
         " doesn't work for incrementColumnValues'd cells since the" +
         " timestamp is changed after being appended to the log.");
-    pgd.driver(args);
+    ProgramDriver.class.getMethod("driver", new Class [] {String[].class}).
+      invoke(pgd, new Object[]{args});
   }
 }