diff --git a/_pytest/python.py b/_pytest/python.py
index 0745587ba..7ad1a085c 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -19,10 +19,8 @@ class FactoryMarker:
         return function
 
 class SetupMarker:
-    def __init__(self, scope, enabled):
+    def __init__(self, scope):
         self.scope = scope
-        self.enabled = enabled
-
     def __call__(self, function):
         function._pytestsetup = self
         return function
@@ -38,17 +36,14 @@ def factory(scope=None, params=None):
     """
     return FactoryMarker(scope, params)
 
-def setup(scope="function", enabled=None):
+def setup(scope="function"):
     """ return a decorator to mark functions as setup functions.
 
     :arg scope: the scope for which the setup function will be active, one
                 of "function", "class", "module", "session".
                 Defaults to "function".
-    :arg enabled: if a callable is specified, enabled(node) will be called
-                and if it returns a false value this setup function
-                will not be called and its funcargs will not be setup.
     """
-    return SetupMarker(scope, enabled)
+    return SetupMarker(scope)
 
 def cached_property(f):
     """returns a cached property that is calculated by function f.