Revert "Remove character encoding information"

This cannot be used with AWS, which doesn't provide Content-Type charset
info.

This reverts commit 1ed92393ec13301ab96793517cb57a5700ce643b.