More robust controller discovery.