Revert "Start of template changes"

This reverts commit 5cd3c6748f4f4422e4bc9ba6932bf88d70281516.