Reverted demo content type and mixin that failed with new XML parsing.