Revert "Fixing templates"

This reverts commit d3605c66a679a57d0e4ed10b3898862b01a333e4.