diff --git a/builder/kojid b/builder/kojid
index 9941815c..2f7f9481 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -145,11 +145,6 @@ def main(options, session):
             logger.info('Loading plugin: %s' % name)
             tm.scanPlugin(pt.load(name))
 
-    if options.single:
-        # force all task handlers to run in Foreground
-        for key in tm.handlers:
-            tm.handlers[key].Foreground = True
-
     def shutdown(*args):
         raise SystemExit
 
diff --git a/koji/daemon.py b/koji/daemon.py
index 5d2eeaf0..16c3420f 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -1379,7 +1379,7 @@ class TaskManager(object):
                 return False
             # otherwise...
             raise
-        if handler.Foreground:
+        if handler.Foreground or getattr(self.options, "single"):
             self.logger.info("running task in foreground")
             handler.setManager(self)
             self.runTask(handler)