diff --git a/cbuildbot/stages/afdo_stages.py b/cbuildbot/stages/afdo_stages.py
index 2378991..ad9d4c8 100644
--- a/cbuildbot/stages/afdo_stages.py
+++ b/cbuildbot/stages/afdo_stages.py
@@ -93,7 +93,7 @@
     # board is None iff master-chromium-pfq. That means we need to update both
     # afdos for gcc(produced on samus) and llvm(produced on chell).
     # TODO: Remove this after the transition is done.
-    afdoboards = [board] if board else ['samus', 'chell']
+    afdoboards = ['samus', 'chell']
     for afdoboard in afdoboards:
       arch_profiles = {}
       afdo.InitGSUrls(afdoboard, reset=True)