This should not be here either, as it encodes data in the template.

should just remove this conditional logic altogether