Revert 6fcf78c98a23c53e09d25e4b1b1ca1594f598fea and fix http install

Also fix some formatting issues