Work on bug #5989.  The templates have been modified.