Re-adding the skip decorator because the content type still cannot be
null. I98a558862eed039ed6f33fbee474bdb86767313e was supposed to fix it,
but something is still broken, and a few extra checks in the test show
this is true.
Change-Id: Icb5c0e28bf0199962d2082143099905d4fb63685