diff --git a/lib/bb/build.py b/lib/bb/build.py
index db706d0a3a..5ac191647c 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -782,7 +782,7 @@ def stamp_internal(taskname, d, file_name, baseonly=False, noextra=False):
     When called in task context, d will be a data store, file_name will not be set
     """
     taskflagname = taskname
-    if taskname.endswith("_setscene") and taskname != "do_setscene":
+    if taskname.endswith("_setscene"):
         taskflagname = taskname.replace("_setscene", "")
 
     if file_name:
@@ -818,7 +818,7 @@ def stamp_cleanmask_internal(taskname, d, file_name):
     When called in task context, d will be a data store, file_name will not be set
     """
     taskflagname = taskname
-    if taskname.endswith("_setscene") and taskname != "do_setscene":
+    if taskname.endswith("_setscene"):
         taskflagname = taskname.replace("_setscene", "")
 
     if file_name:
@@ -865,7 +865,7 @@ def make_stamp(task, d, file_name = None):
 
     # If we're in task context, write out a signature file for each task
     # as it completes
-    if not task.endswith("_setscene") and task != "do_setscene" and not file_name:
+    if not task.endswith("_setscene") and not file_name:
         stampbase = stamp_internal(task, d, None, True)
         file_name = d.getVar('BB_FILENAME')
         bb.parse.siggen.dump_sigtask(file_name, task, stampbase, True)
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 7451e5c56b..63cce8184f 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1408,7 +1408,7 @@ class RunQueue:
             logger.debug2("%s.%s is nostamp\n", fn, taskname)
             return False
 
-        if taskname != "do_setscene" and taskname.endswith("_setscene"):
+        if taskname.endswith("_setscene"):
             return True
 
         if cache is None:
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index be56b3a31c..cdf7d03a34 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -429,7 +429,7 @@ class SignatureGeneratorBasicHash(SignatureGeneratorBasic):
         return self.basehash[tid]
 
     def stampfile(self, stampbase, fn, taskname, extrainfo, clean=False):
-        if taskname != "do_setscene" and taskname.endswith("_setscene"):
+        if taskname.endswith("_setscene"):
             tid = fn + ":" + taskname[:-9]
         else:
             tid = fn + ":" + taskname