Return of the DefaultSystemMessageQueue fixes. See #3170