There are two important changes in this commit.

1. We only run the content type check when the content_type_whitelist
method returns truthy.
2. We don't alter the uploaded file content type as this causes problems
on Google Cloud Storage.