diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py
index 92e7aefc..c0d88ebb 100644
--- a/mopidy/core/tracklist.py
+++ b/mopidy/core/tracklist.py
@@ -326,9 +326,6 @@ class TracklistController(object):
             next_index += 1
 
         if self.get_repeat():
-            # Fix for bug 1512
-            # Return None if consume mode and there is only one track (left)
-            # in the list
             if self.get_consume() and len(self._tl_tracks) == 1:
                 return None
             else:
diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py
index 89b24c7a..6d320b4e 100644
--- a/tests/core/test_playback.py
+++ b/tests/core/test_playback.py
@@ -432,18 +432,15 @@ class TestConsumeHandling(BaseTest):
         self.assertNotIn(tl_track, self.core.tracklist.get_tl_tracks())
 
     def test_next_in_consume_and_repeat_mode_returns_none_on_last_track(self):
-        # Testing for bug 1512
         self.core.playback.play()
         self.core.tracklist.set_consume(True)
         self.core.tracklist.set_repeat(True)
         self.replay_events()
 
-        # Play through the list
         for track in self.core.tracklist.get_tl_tracks():
             self.core.playback.next()
             self.replay_events()
 
-        # Try repeat, player state remain stopped (all tracks consumed)
         self.core.playback.next()
         self.replay_events()