diff --git a/meta/classes/deploy.bbclass b/meta/classes/deploy.bbclass
index 99c4abb6a2..f697e70aa4 100644
--- a/meta/classes/deploy.bbclass
+++ b/meta/classes/deploy.bbclass
@@ -7,5 +7,5 @@ do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
 python do_deploy_setscene () {
     sstate_setscene(d)
 }
-#addtask do_deploy_setscene
+addtask do_deploy_setscene
 do_deploy[dirs] = "${DEPLOYDIR} ${B}"
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ddd1781c7a..b64ff5de58 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1095,7 +1095,7 @@ do_package[sstate-lockfile] = "${PACKAGELOCK}"
 python do_package_setscene () {
 	sstate_setscene(d)
 }
-#addtask do_package_setscene
+addtask do_package_setscene
 
 # Dummy task to mark when all packaging is complete
 do_package_write () {
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 1bb2ebd766..eb4df5e704 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -260,7 +260,7 @@ do_package_write_deb[sstate-outputdirs] = "${DEPLOY_DIR_DEB}"
 python do_package_write_deb_setscene () {
     sstate_setscene(d)
 }
-#addtask do_package_write_deb_setscene
+addtask do_package_write_deb_setscene
 
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 014e4094be..1758283f61 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -307,7 +307,7 @@ do_package_write_ipk[sstate-outputdirs] = "${DEPLOY_DIR_IPK}"
 python do_package_write_ipk_setscene () {
 	sstate_setscene(d)
 }
-#addtask do_package_write_ipk_setscene
+addtask do_package_write_ipk_setscene
 
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b70575cea0..98912cc1fe 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -555,7 +555,7 @@ do_package_write_rpm[sstate-outputdirs] = "${DEPLOY_DIR_RPM}"
 python do_package_write_rpm_setscene () {
 	sstate_setscene(d)
 }
-#addtask do_package_write_rpm_setscene
+addtask do_package_write_rpm_setscene
 
 python do_package_write_rpm () {
 	bb.build.exec_func("read_subpackage_metadata", d)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index fd5e018e68..e82db83892 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -110,7 +110,7 @@ do_populate_sysroot[sstate-outputdirs] = "${TMPDIR}/sysroots"
 python do_populate_sysroot_setscene () {
 	sstate_setscene(d)
 }
-#addtask do_populate_sysroot_setscene
+addtask do_populate_sysroot_setscene
 
 
 python () {