diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 9fb6ec55a871f0448f91b69fb0f94faddbb4e3c4..86a289d2c71d60c2ab52229a413280eb2088e7d7 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -122,9 +122,10 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
         "components.conf",
     ]
 
-# tor-browser#41628: Disable Normandy and Nimbus at compile time
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["messaging-system"]
+    DIRS += ["normandy", "messaging-system"]
+
+DIRS += ["nimbus"]
 
 if CONFIG["MOZ_BACKGROUNDTASKS"]:
     DIRS += ["backgroundtasks"]