[bugfix] Revert incompatible interface change

Adding a new template perameter before the existing ones is
a non-compatible interface change, because code that explicitly
instantiates the template will fail to compile afterwards.

Putting the new template parameter to the end fixes the issue