Backport fix to message from 0.x.x