Revert "Dirty hacks to the templates to keep encoding issues from showing too much"

This reverts commit 9874c7d88e6f543446eff9b901a724e9b35f7e9d.