diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -937,10 +937,7 @@
     """Equivalent to ``y and x``, but faster when x is small"""
     x, y = getargs(args, 2, 2, _("missing argument"))
     if order == defineorder:
-        # NOTE: In theory this could be "anyorder". But many revsets (ex.
-        # "contains") do not handle "defineorder" correctly. This has to be
-        # followorder for now to hide those issues.
-        xorder = followorder
+        xorder = anyorder
     else:
         xorder = order
     return getset(repo, getset(repo, subset, x, xorder), y, order)
diff --git a/tests/test-revset.t b/tests/test-revset.t
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -2070,7 +2070,7 @@
   * set:
   <filteredset
     <spanset- 0:3>,
-    <baseset+ [0, 1, 2]>>
+    <baseset [0, 1, 2]>>
   2
   1
   0