diff --git a/hgext3rd/fastannotate/support.py b/hgext3rd/fastannotate/support.py
--- a/hgext3rd/fastannotate/support.py
+++ b/hgext3rd/fastannotate/support.py
@@ -110,13 +110,12 @@
         return orig(self, follow, linenumber, skiprevs=skiprevs,
                     diffopts=diffopts)
 
-def _remotefctxannotate(orig, self, follow=False, linenumber=None,
-                        skiprevs=None, diffopts=None):
+def _remotefctxannotate(orig, self, follow=False, skiprevs=None, diffopts=None):
     # skipset: a set-like used to test if a fctx needs to be downloaded
     skipset = None
     with context.fctxannotatecontext(self, follow, diffopts) as ac:
         skipset = revmap.revmap(ac.revmappath)
-    return orig(self, follow, linenumber, skiprevs=skiprevs, diffopts=diffopts,
+    return orig(self, follow, skiprevs=skiprevs, diffopts=diffopts,
                 prefetchskip=skipset)
 
 def replacehgwebannotate():
diff --git a/remotefilelog/remotefilectx.py b/remotefilelog/remotefilectx.py
--- a/remotefilelog/remotefilectx.py
+++ b/remotefilelog/remotefilectx.py
@@ -474,9 +474,9 @@
 
         return None
 
-    def annotate(self, follow=False, linenumber=None, skiprevs=None,
-                 diffopts=None, prefetchskip=None):
+    def annotate(self, *args, **kwargs):
         introctx = self
+        prefetchskip = kwargs.pop('prefetchskip', None)
         if prefetchskip:
             # use introrev so prefetchskip can be accurately tested
             introrev = self.introrev()
@@ -510,9 +510,7 @@
                             'for annotate\n' % len(fetch))
         if fetch:
             self._repo.fileservice.prefetch(fetch)
-        return super(remotefilectx, self).annotate(follow, linenumber,
-                                                   skiprevs=skiprevs,
-                                                   diffopts=diffopts)
+        return super(remotefilectx, self).annotate(*args, **kwargs)
 
     # Return empty set so that the hg serve and thg don't stack trace
     def children(self):