Handle onion -x> https redirects better