diff --git a/stackwalk/src/framestepper.C b/stackwalk/src/framestepper.C
index 3be80f083a..f2c44addfa 100644
--- a/stackwalk/src/framestepper.C
+++ b/stackwalk/src/framestepper.C
@@ -77,10 +77,8 @@ void FrameStepper::registerStepperGroup(StepperGroup *group)
    unsigned addr_width = group->getWalker()->getProcessState()->getAddressWidth();
    if (addr_width == 4)
       group->addStepper(this, 0, 0xffffffff);
-#if defined(arch_64bit)
    else if (addr_width == 8)
       group->addStepper(this, 0, 0xffffffffffffffff);
-#endif
    else
       assert(0 && "Unknown architecture word size");
 }
@@ -182,10 +180,8 @@ void DyninstInstrStepperImpl::registerStepperGroup(StepperGroup *group)
   unsigned addr_width = group->getWalker()->getProcessState()->getAddressWidth();
   if (addr_width == 4)
     group->addStepper(parent, 0, 0xffffffff);
-#if defined(arch_64bit)
   else if (addr_width == 8)
     group->addStepper(parent, 0, 0xffffffffffffffff);
-#endif
   else
     assert(0 && "Unknown architecture word size");
 }
@@ -249,10 +245,8 @@ void BottomOfStackStepperImpl::registerStepperGroup(StepperGroup *group)
    unsigned addr_width = group->getWalker()->getProcessState()->getAddressWidth();
    if (addr_width == 4)
       group->addStepper(parent, 0, 0xffffffff);
-#if defined(arch_64bit)
    else if (addr_width == 8)
       group->addStepper(parent, 0, 0xffffffffffffffff);
-#endif
    else
       assert(0 && "Unknown architecture word size");
 }
@@ -309,10 +303,8 @@ void DyninstDynamicStepperImpl::registerStepperGroup(StepperGroup *group)
   unsigned addr_width = group->getWalker()->getProcessState()->getAddressWidth();
   if (addr_width == 4)
     group->addStepper(parent, 0, 0xffffffff);
-#if defined(arch_64bit)
   else if (addr_width == 8)
     group->addStepper(parent, 0, 0xffffffffffffffff);
-#endif
   else
     assert(0 && "Unknown architecture word size");
 }
diff --git a/stackwalk/src/linux-aarch64-swk.C b/stackwalk/src/linux-aarch64-swk.C
index 94dc6532fc..cb90942d5d 100644
--- a/stackwalk/src/linux-aarch64-swk.C
+++ b/stackwalk/src/linux-aarch64-swk.C
@@ -55,7 +55,17 @@ bool Walker::createDefaultSteppers()
   FrameStepper *stepper;
   bool result;
 
-#if !TEST_DEBUGINFO_ALONE
+    stepper = new DebugStepper(this);
+    result = addStepper(stepper);
+    if (!result){
+        sw_printf("[%s:%u] - Error adding stepper %p\n", FILE__, __LINE__,
+                  stepper);
+        return false;
+    }else{
+        sw_printf("[%s:%u] - Stepper %p is DebugStepper\n",
+                  FILE__, __LINE__, stepper);
+    }
+
   stepper = new FrameFuncStepper(this);
   result = addStepper(stepper);
   if (!result) {
@@ -77,18 +87,6 @@ bool Walker::createDefaultSteppers()
             FILE__, __LINE__, stepper);
   }
 
-#else
-  stepper = new DebugStepper(this);
-  result = addStepper(stepper);
-  if (!result){
-    sw_printf("[%s:%u] - Error adding stepper %p\n", FILE__, __LINE__,
-	      stepper);
-    return false;
-  }else{
-    sw_printf("[%s:%u] - Stepper %p is DebugStepper\n",
-            FILE__, __LINE__, stepper);
-  }
-#endif
 
   return true;
 }