Add support for not always setting content-type