Better support for sites available both via HTTP and HTTPS.