diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
index f8cf829ad..b3b1f40f1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -241,6 +241,7 @@ public class ActFmInvoker {
         MD5 md5 = new MD5();
         md5.Update(sigBuilder.toString(), null);
         String signature = md5.asHex();
+//        String signature = DigestUtils.md5Hex(sigBuilder.toString());
         requestBuilder.append("sig").append('=').append(signature);
         return requestBuilder.toString();
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java b/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java
index dd1878b20..2bc2cc827 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
+import org.apache.commons.codec.digest.DigestUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -20,7 +21,6 @@ import org.json.JSONObject;
 import android.text.TextUtils;
 
 import com.todoroo.andlib.utility.Pair;
-import com.twmacinta.util.MD5;
 
 @SuppressWarnings("nls")
 public class ProducteevInvoker {
@@ -657,9 +657,7 @@ public class ProducteevInvoker {
         }
 
         sigBuilder.append(apiSecret);
-        MD5 md5 = new MD5();
-        md5.Update(sigBuilder.toString(), null);
-        String signature = md5.asHex();
+        String signature = DigestUtils.md5Hex(sigBuilder.toString());
         requestBuilder.append("api_sig").append('=').append(signature);
         return requestBuilder.toString();
     }
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
index 3c75eea7c..c4b93cc65 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
@@ -10,6 +10,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -24,7 +25,6 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.RestClient;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.service.StatisticsService;
-import com.twmacinta.util.MD5;
 
 /**
  * Invoker for communicating with the Astrid Analytics server
@@ -116,9 +116,7 @@ public class ABTestInvoker {
         }
 
         sigBuilder.append(API_SECRET);
-        MD5 md5 = new MD5();
-        md5.Update(sigBuilder.toString(), null);
-        String signature = md5.asHex();
+        String signature = DigestUtils.md5Hex(sigBuilder.toString());
         params.add(new BasicNameValuePair("sig", signature));
 
         try {