Should we switch this to cp_content_override?