diff --git a/Products/LDAPMultiPlugins/ActiveDirectoryMultiPlugin.py b/Products/LDAPMultiPlugins/ActiveDirectoryMultiPlugin.py
index b99a05c..b8469ee 100644
--- a/Products/LDAPMultiPlugins/ActiveDirectoryMultiPlugin.py
+++ b/Products/LDAPMultiPlugins/ActiveDirectoryMultiPlugin.py
@@ -15,23 +15,20 @@
 $Id$
 """
 
-# General Python imports
 import logging
 import os
 from urllib import quote_plus
 
-# Zope imports
 from Acquisition import aq_base
 from App.class_init import default__class_init__ as InitializeClass
 from App.Common import package_home
 from App.special_dtml import DTMLFile
 from AccessControl import ClassSecurityInfo
-from Products.LDAPUserFolder import manage_addLDAPUserFolder
-from Products.LDAPUserFolder.LDAPDelegate import filter_format
-from Products.LDAPUserFolder.utils import BINARY_ATTRIBUTES
-
 from zope.interface import implementedBy
 
+from dataflake.ldapconnection.connection import filter_format
+from Products.LDAPUserFolder import manage_addLDAPUserFolder
+from Products.LDAPUserFolder.utils import BINARY_ATTRIBUTES
 from Products.PluggableAuthService.interfaces.plugins import \
      IUserEnumerationPlugin, IGroupsPlugin, IGroupEnumerationPlugin, \
      IRoleEnumerationPlugin