Revert parts of 3500a184e5ca652370fdaa7e2c2217290fadf69c.

Changing the order in which arguments are passed will break community use of this helper function.

See https://github.com/wp-cli/wp-cli/commit/3500a184e5ca652370fdaa7e2c2217290fadf69c#commitcomment-3174323