Reverting 4aa74ec for now. It's broke templates, not interested in wasting more time debugging further