diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C
index 3d31d6dd028..a4c19762111 100644
--- a/src/usr/isteps/pm/pm_common.C
+++ b/src/usr/isteps/pm/pm_common.C
@@ -285,15 +285,23 @@ namespace HBPM
 
         do
         {
-            // TODO RTC: 214257
-            // Remove workaround forcing use of NIMBUS lid for Axone's hcode lid
-            #ifdef CONFIG_AXONE_BRING_UP
-            bool l_isNimbus = true;
-            #else
-            bool l_isNimbus = (i_target->getAttr<ATTR_MODEL>() == MODEL_NIMBUS);
-            #endif
-            uint32_t l_lidId = (l_isNimbus) ? Util::NIMBUS_HCODE_LIDID
-                                            : Util::CUMULUS_HCODE_LIDID;
+            uint32_t l_lidId = 0;
+            auto l_model = i_target->getAttr<ATTR_MODEL>();
+            switch( l_model )
+            {
+                case(MODEL_AXONE):
+                    // Axone just reuses the Nimbus LIDID since it is only
+                    //  used to lookup a common partition in PNOR
+                case(MODEL_NIMBUS):
+                    l_lidId = Util::NIMBUS_HCODE_LIDID;
+                    break;
+                case(MODEL_CUMULUS):
+                    l_lidId = Util::CUMULUS_HCODE_LIDID;
+                    break;
+                default:
+                    assert(false,"Unsupported proc type");
+            }
+
             if(g_pHcodeLidMgr.get() == nullptr)
             {
                 g_pHcodeLidMgr = std::shared_ptr<UtilLidMgr>
diff --git a/src/usr/util/utillidpnor.C b/src/usr/util/utillidpnor.C
index 8d81ad0c1c0..96cee123bdd 100644
--- a/src/usr/util/utillidpnor.C
+++ b/src/usr/util/utillidpnor.C
@@ -53,10 +53,6 @@ static const PnorLidsMap PnorToLidsMap =
     { PNOR::OCC,     LidAndContainerLid(OCC_LIDID, OCC_CONTAINER_LIDID)},
     { PNOR::WOFDATA, LidAndContainerLid(WOF_LIDID, WOF_CONTAINER_LIDID)},
     { PNOR::HCODE,   LidAndContainerLid(NIMBUS_HCODE_LIDID, HCODE_CONTAINER_LIDID)},
-    /* @TODO RTC:177927 - Figure out how to handle different Lids for the
-                              same PNOR section based on chip.
-    { PNOR::HCODE,   LidAndContainerLid(CUMULUS_HCODE_LIDID, HCODE_CONTAINER_LIDID)},
-    */
     { PNOR::RINGOVD, LidAndContainerLid(HWREFIMG_RINGOVD_LIDID,INVALID_LIDID)},
 };