Bug 1065376 solved

Request to review and merge solution for bug 1065376.
why are we adding this here?  is there a smaller chunk of a template we could use?