4 files changed, 2 insertions, 6 deletions
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 0b587904f..cc1492570 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -905,7 +905,7 @@ class API(plugable.API):
     def bootstrap(self, parser=None, **overrides):
         super(API, self).bootstrap(parser, **overrides)
 
-        if self.env.context in ('server', 'lite'):
+        if self.env.in_server:
             self.packages.append('ipaserver')
         if self.env.context in ('installer', 'updates'):
             self.packages.append('ipaserver/install/plugins')
diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py
index d2bc68f45..9068ef0fd 100644
--- a/ipalib/plugins/baseuser.py
+++ b/ipalib/plugins/baseuser.py
@@ -38,8 +38,6 @@ from ipapython.ipavalidate import Email
 from ipalib.capabilities import client_has_capability
 from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
     convert_sshpubkey_post)
-if api.env.in_server and api.env.context in ['lite', 'server']:
-    from ipaserver.plugins.ldap2 import ldap2
 
 __doc__ = _("""
 Baseuser
diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py
index 7c714f627..01c01cea3 100644
--- a/ipalib/plugins/stageuser.py
+++ b/ipalib/plugins/stageuser.py
@@ -42,8 +42,6 @@ from ipapython.ipavalidate import Email
 from ipalib.capabilities import client_has_capability
 from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
     convert_sshpubkey_post)
-if api.env.in_server and api.env.context in ['lite', 'server']:
-    from ipaserver.plugins.ldap2 import ldap2
 
 __doc__ = _("""
 Stageusers
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 0b90519b2..96de65ac5 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -44,7 +44,7 @@ from ipapython.ipavalidate import Email
 from ipalib.capabilities import client_has_capability
 from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
     convert_sshpubkey_post)
-if api.env.in_server and api.env.context in ['lite', 'server']:
+if api.env.in_server:
     from ipaserver.plugins.ldap2 import ldap2
 
 __doc__ = _("""