Allow roundtrip messages when passMessages is not set