LPS-52042 - Temporary fix until LDAP refactoring done