Use kingcody's https fix until it's merged