Changed to update the headers manually for backward compatibility.