Revert "more cleanup of template to leave only most common params"

This reverts commit b83a5e799ac5891602c55eab168b129180a59187.