Support http as well for #952