diff --git a/library/system/setup b/library/system/setup
index c6583d42029..71120b72dc2 100644
--- a/library/system/setup
+++ b/library/system/setup
@@ -2305,8 +2305,8 @@ def ansible_facts(module):
 
 def run_setup(module):
 
-    setup_options = {}
-    facts = ansible_facts(module)
+    setup_options = dict(module_setup=True)
+    facts = ansible_facts()
 
     for (k, v) in facts.items():
         setup_options["ansible_%s" % k.replace('-', '_')] = v