Remove indication that one can specify the ID inside the message payload.