Changes for not running over SSL.