Revert "Use last entry for Content-Type"