diff --git a/app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
index 956cc72e1..8cdbc31dd 100644
--- a/app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
+++ b/app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
@@ -185,10 +185,4 @@ public class DatabaseDao {
         };
         return insertOrUpdateAndRecordChanges(item, update);
     }
-
-    // --- helper methods
-
-    public int count(Query query) {
-        return query(query).count();
-    }
 }
diff --git a/app/src/main/java/com/todoroo/andlib/data/TodorooCursor.java b/app/src/main/java/com/todoroo/andlib/data/TodorooCursor.java
index 181d7bde5..bfed12eea 100644
--- a/app/src/main/java/com/todoroo/andlib/data/TodorooCursor.java
+++ b/app/src/main/java/com/todoroo/andlib/data/TodorooCursor.java
@@ -64,14 +64,6 @@ public class TodorooCursor extends CursorWrapper {
         return new Task(this);
     }
 
-    public int count() {
-        try {
-            return getCount();
-        } finally {
-            close();
-        }
-    }
-
     public Task first() {
         try {
             return moveToFirst() ? toModel() : null;
diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
index eeab45a89..ff97d2f21 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
@@ -8,6 +8,7 @@ package com.todoroo.astrid.dao;
 import android.arch.persistence.room.Dao;
 import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 
 import com.todoroo.andlib.data.DatabaseDao;
 import com.todoroo.andlib.data.Property;
@@ -88,7 +89,12 @@ public abstract class TaskDao {
     }
 
     public int count(Query query) {
-        return dao.count(query);
+        Cursor cursor = dao.query(query);
+        try {
+            return cursor.getCount();
+        } finally {
+            cursor.close();
+        }
     }
 
     public List<Task> query(Filter filter) {