Oops, these were "misrefactored" (TM)
Merge pull request #7110 from guardian/content-types

Oops, these were "misrefactored" (TM)