Revert "Updated templates"

This reverts commit f5476ec13f2e590684592efef343502705483fa6.