Revert "new template"

This reverts commit 2b5e4b34e7f9d0b84301524c1d620439d6e97013.