Re-order params for backwards compat

Address @kevinburke's concerns