Don't break BC in that way - breaks existing custom templates