Merge "Revert "Captive portal: rotate fallback urls""