diff --git a/source/os_specific/service_layers/osefitbl.c b/source/os_specific/service_layers/osefitbl.c
index ec2161915..42924053d 100644
--- a/source/os_specific/service_layers/osefitbl.c
+++ b/source/os_specific/service_layers/osefitbl.c
@@ -305,18 +305,7 @@ AcpiOsGetTableByName (
 
     /* Not a main ACPI table, attempt to extract it from the RSDT/XSDT */
 
-    if (!Gbl_DumpCustomizedTables)
-    {
-        /* Attempt to get the table from the memory */
-
-        Status = OslGetTable (Signature, Instance, Table, Address);
-    }
-    else
-    {
-        /* Attempt to get the table from the static directory */
-
-        Status = AE_SUPPORT;
-    }
+    Status = OslGetTable (Signature, Instance, Table, Address);
 
     return (Status);
 }
@@ -650,56 +639,47 @@ OslTableInitialize (
         return (Status);
     }
 
-    if (!Gbl_DumpCustomizedTables)
+    /* Add mandatory tables to global table list first */
+
+    Status = OslAddTableToList (ACPI_RSDP_NAME, 0);
+    if (ACPI_FAILURE (Status))
     {
-        /* Add mandatory tables to global table list first */
+        return (Status);
+    }
 
-        Status = OslAddTableToList (ACPI_RSDP_NAME, 0);
-        if (ACPI_FAILURE (Status))
-        {
-            return (Status);
-        }
+    Status = OslAddTableToList (ACPI_SIG_RSDT, 0);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
 
-        Status = OslAddTableToList (ACPI_SIG_RSDT, 0);
-        if (ACPI_FAILURE (Status))
-        {
-            return (Status);
-        }
-
-        if (Gbl_Revision == 2)
-        {
-            Status = OslAddTableToList (ACPI_SIG_XSDT, 0);
-            if (ACPI_FAILURE (Status))
-            {
-                return (Status);
-            }
-        }
-
-        Status = OslAddTableToList (ACPI_SIG_DSDT, 0);
-        if (ACPI_FAILURE (Status))
-        {
-            return (Status);
-        }
-
-        Status = OslAddTableToList (ACPI_SIG_FACS, 0);
-        if (ACPI_FAILURE (Status))
-        {
-            return (Status);
-        }
-
-        /* Add all tables found in the memory */
-
-        Status = OslListTables ();
+    if (Gbl_Revision == 2)
+    {
+        Status = OslAddTableToList (ACPI_SIG_XSDT, 0);
         if (ACPI_FAILURE (Status))
         {
             return (Status);
         }
     }
-    else
-    {
-        /* Add all tables found in the static directory */
 
-        Status = AE_SUPPORT;
+    Status = OslAddTableToList (ACPI_SIG_DSDT, 0);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    Status = OslAddTableToList (ACPI_SIG_FACS, 0);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    /* Add all tables found in the memory */
+
+    Status = OslListTables ();
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
     }
 
     Gbl_TableListInitialized = TRUE;