Merge "Re-introduce use of mime_content_type()"