Moving back to HTTPS, preparing for 3.1