Revert "Do not force $conf['https'] on non-SSL URLs."

This reverts commit 9d896120374ebadf5fd521e9d750f40b721c7977.