core/msg: clean up after #1285

undoes an optimization introduced by #1285