Revert "Simplify createParams"

This reverts commit 9d852a0c20532f2e5687ec7973b6be157e7d482a.