diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index fb9fb4008512a55846091abd1e9a523068402dee..1be3e358fcaef9f62a6a444c0032a2b104f33c82 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -23,10 +23,10 @@ class SimpleSAML_Auth_LDAP {
 
 		SimpleSAML_Logger::debug('Library - LDAP __construct(): Setup LDAP with host [' . $hostname . '] and tls [' . var_export($enable_tls, true) . ']');
 
-		ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
+#		ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
 		$this->ldap = @ldap_connect($hostname);
 #		ldap_set_option($this->ldap, LDAP_OPT_NETWORK_TIMEOUT, 2);
-		ldap_set_option($this->ldap, LDAP_OPT_TIMELIMIT, 2);
+#		ldap_set_option($this->ldap, LDAP_OPT_TIMELIMIT, 2);
 
 		if (empty($this->ldap)) 
 			throw new Exception('Error initializing LDAP connection with PHP LDAP library.');
@@ -130,7 +130,6 @@ class SimpleSAML_Auth_LDAP {
 				join(' & ', $searchbases));
 		}
 
-
 	}
 	
 	/**