Removing MSG_PARAM_INDEX part since it's removed in the upstream