diff --git a/meta/classes-recipe/populate_sdk.bbclass b/meta/classes-recipe/populate_sdk.bbclass
index caeef5d2b2a..3b89ff997f5 100644
--- a/meta/classes-recipe/populate_sdk.bbclass
+++ b/meta/classes-recipe/populate_sdk.bbclass
@@ -10,4 +10,11 @@
 inherit populate_sdk_base
 
 addtask populate_sdk after do_install before do_build
-
+addhandler inject_sdk_rm_work
+inject_sdk_rm_work[eventmask] = "bb.event.RecipeTaskPreProcess"
+python inject_sdk_rm_work() {
+    if d.getVar('RM_WORK_BUILD_WITHOUT'):
+        bb.build.addtask('do_populate_sdk', 'do_rm_work do_build', ' ', d)
+    else:
+        bb.build.addtask('do_populate_sdk', 'do_build', ' ', d)
+}
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
index b427ff27616..073949ebcde 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -435,3 +435,10 @@ do_populate_sdk[rdepends] = "${@' '.join([x + ':do_package_write_${IMAGE_PKGTYPE
 do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb do_package_qa"
 do_populate_sdk[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
 addtask populate_sdk
+
+addhandler inject_sdk_rm_work
+inject_sdk_rm_work[eventmask] = "bb.event.RecipeTaskPreProcess"
+python inject_sdk_rm_work() {
+    if d.getVar('RM_WORK_BUILD_WITHOUT'):
+        bb.build.addtask('do_populate_sdk', 'do_rm_work', ' ', d)
+}