Revert "Template change"

This reverts commit 3c279bc66831edfe2c370bddb257bdd0741bdc25.
Revert "Template changes"

This reverts commit ea20e3ae8f60ca7548d4b83dd19acc5fc576d533.