remove messageComponent until we handle markup GitOrigin-RevId: d4220277d3cb16eda32325eb3ba2f70102e36d2c