Revert "content type field cleanup"

This reverts commit 0b1dda167c579c496ea8632997240cea56344718.