Revert "Add defaulted template parameter to work around ROOT6 issue"
Merge pull request #5140 from wmtan/revert-5098-AddDefaultedTemplateParameter

Revert "Add defaulted template parameter to work around ROOT6 issue"