Revert "System message improvements"

This reverts commit 7e48efeabf748a4e8a6ee76c209e0a287bf9a876, reversing
changes made to 2664d431641480c89fc76967f827dd7c77d873ac.
Wrong commit in XMLQuery