Re-order params for backwards compat
Merge pull request #2268 from sigmavirus24/fix-params

Re-order params for backwards compat