Revert back to BaseFile detection, but set content type regardless to allow namer to set extension.