core/msg: revert part of #1285

undoes an optimization introduced by #1285
Ah, fail all around..