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

This reverts pull request 5098, which did not work around the ROOT 6 bug that I thought it worked around.
Please merge as soon as convenient.