Switch to new discoverrunner