update template to working version, remove workaround