Revert "Parametrized version"

This reverts commit 66e34dcc5a5964c8bd4e2df81d03286d72e221ac.