Revert ugly corp LDAP workaround