Switching discovery off by default