Revert previous change: we're not ready to stream over SSL yet. Always
fall back to port 80.
Merge branch 'public/7.7' into public/7.8