Comment # 3 on bug 1232454 from Christophe Marin

I'm not really convinced upstream should still allow http, but I'll backport
the change to match the 6.2.0 behaviour.