Revert "Remove unneeded parameter boilerplate"

This reverts commit ad29ddedff7fa4cc91acaf5939218ca2a6744e4c.