Actually implement the message extra argument
Cherry-pick from remote-tracking branch 'remotes/vially/master'