Bug 937973 - Fix discoverable not working problem, r=gyeh