diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/util.py b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/util.py
index 7d16104cb6..9cd311c358 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/util.py
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/util.py
@@ -19,7 +19,6 @@ import bisect
 from dataclasses import dataclass
 import re
 from typing import Callable, Dict, List, Optional, Sequence, Set, Tuple, Union
-import platform
 
 import gdb
 
@@ -468,7 +467,7 @@ class RegisterDesc:
 
 def get_register_descs(arch: gdb.Architecture, group: str = 'all') -> List[
         Union[RegisterDesc, gdb.RegisterDescriptor]]:
-    if hasattr(arch, "registers") and platform.system() != "OpenBSD":
+    if hasattr(arch, "registers"):
         try:
             return list(arch.registers(group))
         except ValueError:  # No such group, or version too old
@@ -482,7 +481,7 @@ def get_register_descs(arch: gdb.Architecture, group: str = 'all') -> List[
             regset = gdb.execute(
                 f"info registers", to_string=True).strip().split('\n')
         for line in regset:
-            if not line.startswith(" ") and "<unavailable>" not in line:
+            if not line.startswith(" "):
                 tokens = line.strip().split()
                 descs.append(RegisterDesc(tokens[0]))
         return descs