Revert "NXP-10974: no need to encode parameter that will be encoded anyway a few lines below"

This reverts commit bef487f2cf60b78b00970102b92a59921a34425b.
Revert "NXP-10974: format/cleanup"

This reverts commit b7293e56b45116e9a0691d322c066b18f7264330.