Revert "Fix order of constructor params"

This reverts commit b6c9ed4acf5d86b57317efa2dde92bfecef47ab2.