Handle the different situations slightly better.
Allow to specify not to fallback to http.
Authored by: dannybackx 2021-04-04
Parent: [r375]
Child: [r377]
