Revert "changed Templates"

This reverts commit d70585f8b3cd5d00f847e37d0d8e144c816944bf, reversing
changes made to 573f8428774cee027caa013b350b07514ef301c9.