diff --git a/anki/collection.py b/anki/collection.py
index dcdcc87f2..3e4f62ef3 100644
--- a/anki/collection.py
+++ b/anki/collection.py
@@ -485,27 +485,17 @@ where c.nid == f.id
     ##########################################################################
 
     def startTimebox(self):
-        self.lastSessionStart = self.sessionStartTime
-        self.sessionStartTime = time.time()
-        self.sessionStartReps = self.repsToday
-
-    def stopTimebox(self):
-        self.sessionStartTime = 0
-
-    def timeboxStarted(self):
-        return self.sessionStartTime
+        self._startTime = time.time()
+        self._startReps = self.sched.reps
 
     def timeboxReached(self):
-        if not self.sessionStartTime:
-            # not started
+        "Return (elapsedTime, reps) if timebox reached, or False."
+        if not self.conf['timeLim']:
+            # timeboxing disabled
             return False
-        if (self.sessionTimeLimit and time.time() >
-            (self.sessionStartTime + self.sessionTimeLimit)):
-            return True
-        if (self.sessionRepLimit and self.sessionRepLimit <=
-            self.repsToday - self.sessionStartReps):
-            return True
-        return False
+        elapsed = time.time() - self._startTime
+        if elapsed > self.conf['timeLim']:
+            return (self.conf['timeLim'], self.sched.reps - self._startReps)
 
     # Undo
     ##########################################################################
diff --git a/anki/sched.py b/anki/sched.py
index 6605130fa..424915b4c 100644
--- a/anki/sched.py
+++ b/anki/sched.py
@@ -24,7 +24,6 @@ class Scheduler(object):
         self.col = col
         self.queueLimit = 50
         self.reportLimit = 1000
-        # fixme: replace reps with deck based counts
         self.reps = 0
         self._updateCutoff()