Revert "Fix parameter list order when splitting a string"

This reverts commit 8c9b903e73ec27f88dfebe3298f8002b4ffc2b01

Change-Id: I7d69a4896d816bd701dba0d1b5191fc7c6848caa