Revert "Move setting content_type to AV"

This reverts commit f4d602aff6cec80304b131ecfcc2676d0304f0cc.