Revert "Minor fix for templates"

This reverts commit 938661d44ef6f1942b51c8dbadeaf7cdee626f98.