Revert to handlebar templating