Revert "new template"

This reverts commit feaa716dc016755ce1e52973257b14808302d9ae.