Re-introducing https support