This fixes #7782.  The template is fixed.