revert content-type generics

// FREEBIE
Merge pull request #2028 from mcginty/revert-generic-contenttype

revert content-type generics