oic

Yeah this discover logic is insane and has been insane for a long time. I absolve you of responsibility (though have fun fielding questions about this in the future since you're going to get git blame'd for it! :p).