Merge "Remove dead mime_content_type() code paths"