Workaround for https://jira.springsource.org/browse/LDAP-228