Implement https://github.com/rec/echomesh/issues/412