Revert "template fixes"

This reverts commit 5c840765e4d83daacc63ab49b63d73f4b5e053e0.