This fixes 404 Content-Type that were supposed to be fixed last time.
cc @axil @dblessing
This will create a new commit in order to revert the existing changes.
