diff --git a/source/components/namespace/nsxfobj.c b/source/components/namespace/nsxfobj.c
index 0596e959b..68b6325bb 100644
--- a/source/components/namespace/nsxfobj.c
+++ b/source/components/namespace/nsxfobj.c
@@ -2,7 +2,7 @@
  *
  * Module Name: nsxfobj - Public interfaces to the ACPI subsystem
  *                         ACPI Object oriented interfaces
- *              $Revision: 1.91 $
+ *              $Revision: 1.93 $
  *
  ******************************************************************************/
 
@@ -166,14 +166,6 @@ AcpiEvaluateObject (
     FUNCTION_TRACE ("AcpiEvaluateObject");
 
 
-    /* Ensure that ACPI has been initialized */
-
-    ACPI_IS_INITIALIZATION_COMPLETE (Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
     /*
      * If there are parameters to be passed to the object
      * (which must be a control method), the external objects
@@ -402,14 +394,6 @@ AcpiGetNextObject (
     ACPI_NAMESPACE_NODE     *ChildNode = NULL;
 
 
-    /* Ensure that ACPI has been initialized */
-
-    ACPI_IS_INITIALIZATION_COMPLETE (Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return (Status);
-    }
-
     /* Parameter validation */
 
     if (Type > ACPI_TYPE_MAX)
@@ -490,17 +474,8 @@ AcpiGetType (
     ACPI_OBJECT_TYPE        *RetType)
 {
     ACPI_NAMESPACE_NODE     *Node;
-    ACPI_STATUS             Status;
 
 
-    /* Ensure that ACPI has been initialized */
-
-    ACPI_IS_INITIALIZATION_COMPLETE (Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return (Status);
-    }
-
     /* Parameter Validation */
 
     if (!RetType)
@@ -560,14 +535,6 @@ AcpiGetParent (
     ACPI_STATUS             Status = AE_OK;
 
 
-    /* Ensure that ACPI has been initialized */
-
-    ACPI_IS_INITIALIZATION_COMPLETE (Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return (Status);
-    }
-
     if (!RetHandle)
     {
         return (AE_BAD_PARAMETER);
@@ -658,14 +625,6 @@ AcpiWalkNamespace (
     FUNCTION_TRACE ("AcpiWalkNamespace");
 
 
-    /* Ensure that ACPI has been initialized */
-
-    ACPI_IS_INITIALIZATION_COMPLETE (Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
     /* Parameter validation */
 
     if ((Type > ACPI_TYPE_MAX)  ||
@@ -812,14 +771,6 @@ AcpiGetDevices (
     FUNCTION_TRACE ("AcpiGetDevices");
 
 
-    /* Ensure that ACPI has been initialized */
-
-    ACPI_IS_INITIALIZATION_COMPLETE (Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
     /* Parameter validation */
 
     if (!UserFunction)